diff --git a/README.md b/README.md
index 44a6a2c19..ec6b243ef 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ Class01 : size()
 Class01 : int chimp
 Class01 : int gorilla
 Class08 <--> C2: Cool label
+<<interface>> Class01
 ```
 ![Class diagram](./img/class.png)
 
diff --git a/dist/index.html b/dist/index.html
index 027b17213..d5e7ba0a0 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -411,6 +411,7 @@ Class01 : size()
 Class01 : int chimp
 Class01 : int gorilla
 Class08 <--> C2: Cool label
+&lt;&lt;interface&gt;&gt; Class01
   </div>
   <script src="./mermaid.js"></script>
   <script>
diff --git a/src/diagrams/class/classDb.js b/src/diagrams/class/classDb.js
index b364d9987..93fe7fb7e 100644
--- a/src/diagrams/class/classDb.js
+++ b/src/diagrams/class/classDb.js
@@ -44,6 +44,10 @@ export const addRelation = function(relation) {
   relations.push(relation);
 };
 
+export const addAnnotation = function(className, annotation) {
+  classes[className].annotations.push(annotation);
+};
+
 export const addMember = function(className, member) {
   const theClass = classes[className];
   if (typeof member === 'string') {
@@ -86,6 +90,7 @@ export default {
   clear,
   getClass,
   getClasses,
+  addAnnotation,
   getRelations,
   addRelation,
   addMember,
diff --git a/src/diagrams/class/classRenderer.js b/src/diagrams/class/classRenderer.js
index b4344e459..2ee1f0087 100644
--- a/src/diagrams/class/classRenderer.js
+++ b/src/diagrams/class/classRenderer.js
@@ -264,9 +264,6 @@ const drawClass = function(elem, classDef) {
     .attr('y', conf.textHeight + conf.padding)
     .attr('x', 0);
 
-  // TODO: remove testing code
-  classDef.annotations = ['interface', 'injected'];
-
   // add annotations
   let isFirst = true;
   classDef.annotations.forEach(function(member) {
@@ -276,11 +273,12 @@ const drawClass = function(elem, classDef) {
   });
 
   // add class title
-  title
+  const classTitle = title
     .append('tspan')
     .text(classDef.id)
-    .attr('class', 'title')
-    .attr('dy', conf.textHeight);
+    .attr('class', 'title');
+
+  if (!isFirst) classTitle.attr('dy', conf.textHeight);
 
   const titleHeight = title.node().getBBox().height;
 
@@ -334,7 +332,6 @@ const drawClass = function(elem, classDef) {
 
   // Center title
   title.node().childNodes.forEach(function(x) {
-    console.dir(x.getBBox());
     x.setAttribute('x', (classBox.width + 2 * conf.padding - x.getBBox().width) / 2);
   });
 
diff --git a/src/diagrams/class/parser/classDiagram.jison b/src/diagrams/class/parser/classDiagram.jison
index 8c6b37a2f..547f9ca4c 100644
--- a/src/diagrams/class/parser/classDiagram.jison
+++ b/src/diagrams/class/parser/classDiagram.jison
@@ -21,6 +21,8 @@
 
 
 "class"               return 'CLASS';
+"<<"                  return 'ANNOTATION_START';
+">>"                  return 'ANNOTATION_END';
 ["]                   this.begin("string");
 <string>["]           this.popState();
 <string>[^"]*         return "STR";
@@ -131,7 +133,6 @@ statements
     | statement NEWLINE statements
     ;
 
-
 className
     : alphaNumToken className { $$=$1+$2; }
     | alphaNumToken { $$=$1; }
@@ -142,6 +143,7 @@ statement
     | relationStatement LABEL { $1.title =  yy.cleanupLabel($2); yy.addRelation($1);        }
     | classStatement
     | methodStatement
+    | annotationStatement
     ;
 
 classStatement
@@ -149,6 +151,10 @@ classStatement
     | CLASS className STRUCT_START members STRUCT_STOP {/*console.log($2,JSON.stringify($4));*/yy.addClass($2);yy.addMembers($2,$4);}
     ;
 
+annotationStatement
+    : ANNOTATION_START alphaNumToken ANNOTATION_END className  { yy.addAnnotation($4,$2); }
+    ;
+
 members
     : MEMBER { $$ = [$1]; }
     | MEMBER members { $2.push($1);$$=$2;}