diff --git a/public/api-builder/angular.io-package/index.js b/public/api-builder/angular.io-package/index.js
index 34e19be75b..2a1a81706b 100644
--- a/public/api-builder/angular.io-package/index.js
+++ b/public/api-builder/angular.io-package/index.js
@@ -74,7 +74,7 @@ module.exports = new Package('angular.io', [basePackage])
 
 .config(function(templateEngine, getInjectables) {
   templateEngine.filters = templateEngine.filters.concat(getInjectables([require('./rendering/trimBlankLines')]));
-  templateEngine.filters = templateEngine.filters.concat(getInjectables([require('./rendering/indentNonMixin')]));
+  templateEngine.filters = templateEngine.filters.concat(getInjectables([require('./rendering/indentForMarkdown')]));
 });
 
 
diff --git a/public/api-builder/angular.io-package/rendering/indentForMarkdown.js b/public/api-builder/angular.io-package/rendering/indentForMarkdown.js
new file mode 100644
index 0000000000..e7d8dea4fe
--- /dev/null
+++ b/public/api-builder/angular.io-package/rendering/indentForMarkdown.js
@@ -0,0 +1,62 @@
+module.exports = function(encodeCodeBlock) {
+  // var MIXIN_PATTERN = /\S*\+\S*\(.*/;
+  return {
+    name: 'indentForMarkdown',
+    process: function (str, width ) {
+      if(str == null || str.length === 0) {
+        return '';
+      }
+      width = width || 4;
+
+      var lines = str.split('\n');
+      var newLines = [];
+      var sp = spaces(width);
+      var spMixin = spaces(width - 2);
+      var isAfterMarkdownTag = true;
+      lines.forEach(function(line) {
+        // indent lines that match mixin pattern by 2 less than specified width
+        if (line.indexOf('{@example') >= 0) {
+          if (isAfterMarkdownTag) {
+            // happens if example follows example
+            if (newLines.length > 0) {
+              newLines.pop();
+            } else {
+              // wierd case - first expression in str is an @example
+              // in this case the :markdown appear above the str passed in,
+              // so we need to put 'something' into the markdown tag.
+              newLines.push(sp + "."); // '.' is a dummy char
+            }
+          }
+          newLines.push(spMixin + line);
+          // after a mixin line we need to reenter markdown.
+          newLines.push(spMixin + ':markdown');
+          isAfterMarkdownTag = true;
+        } else {
+          if ((!isAfterMarkdownTag) || (line.trim().length > 0)) {
+            newLines.push(sp + line);
+            isAfterMarkdownTag = false;
+          }
+        }
+      });
+      if (isAfterMarkdownTag) {
+        if (newLines.length > 0) {
+          // if last line is a markdown tag remove it.
+          newLines.pop();
+        }
+      }
+
+      var res = newLines.join('\n');
+
+      return res;
+    }
+  };
+
+  function spaces(n) {
+    var str = '';
+    for(var i=0; i<n; i++) {
+      str += ' ';
+    }
+    return str;
+  };
+
+};
\ No newline at end of file
diff --git a/public/api-builder/angular.io-package/rendering/indentNonMixin.js b/public/api-builder/angular.io-package/rendering/indentNonMixin.js
deleted file mode 100644
index 3748b772cd..0000000000
--- a/public/api-builder/angular.io-package/rendering/indentNonMixin.js
+++ /dev/null
@@ -1,49 +0,0 @@
-module.exports = function(encodeCodeBlock) {
-  var MIXIN_PATTERN = /\S*\+\S*\(.*/;
-  return {
-    name: 'indentNonMixin',
-    process: function (str, width, indentfirst) {
-      str = normalize(str, '');
-
-      if (str === '') return '';
-
-      width = width || 4;
-      var res = '';
-      var lines = str.split('\n');
-      var sp = repeat(' ', width);
-      var spMixin = repeat(' ', width - 2);
-
-      for (var i = 0; i < lines.length; i++) {
-        if (i === 0 && !indentfirst) {
-          res += lines[i] + '\n';
-        }
-        else {
-          // indent lines that match mixin pattern by 2 less.
-          if (lines[i].indexOf('{@example') != -1) {
-            res += spMixin + lines[i] + '\n';
-          } else {
-            res += sp + lines[i] + '\n';
-          }
-        }
-      }
-
-      return res;
-    }
-  };
-
-  function normalize(value, defaultValue) {
-    if(value === null || value === undefined || value === false) {
-      return defaultValue;
-    }
-    return value;
-  }
-
-  function repeat(char_, n) {
-    var str = '';
-    for(var i=0; i<n; i++) {
-      str += char_;
-    }
-    return str;
-  };
-
-};
\ No newline at end of file
diff --git a/public/api-builder/angular.io-package/templates/class.template.html b/public/api-builder/angular.io-package/templates/class.template.html
index 7e5c317763..8e852e86c9 100644
--- a/public/api-builder/angular.io-package/templates/class.template.html
+++ b/public/api-builder/angular.io-package/templates/class.template.html
@@ -8,7 +8,7 @@ p.location-badge.
   defined in {$ githubViewLink(doc) $}
 
 :markdown
-{$ doc.description | indentNonMixin(2, true) | trimBlankLines $}
+{$ doc.description | indentForMarkdown(2) | trimBlankLines $}
 
 {%- if doc.decorators %}
 .l-main-section
@@ -37,7 +37,7 @@ p.location-badge.
         {$ doc.constructorDoc.name $}{$ paramList(doc.constructorDoc.parameters) | indent(8, false) | trim $}
     {% endif %}
     :markdown
-{$ doc.constructorDoc.description | indentNonMixin(6, true) | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
+{$ doc.constructorDoc.description | indentForMarkdown(6) | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
 
 
 {% endif -%}
@@ -52,7 +52,7 @@ p.location-badge.
         {$ member.name $}{$ paramList(member.parameters) | indent(8, false) | trim $}{$ returnType(doc.returnType) $}
     {% endif %}
     :markdown
-{$ member.description | indentNonMixin(6, true) | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
+{$ member.description | indentForMarkdown(6) | replace('## Example', '') | replace('# Example', '') | trimBlankLines $}
 
 
 
diff --git a/public/api-builder/angular.io-package/templates/function.template.html b/public/api-builder/angular.io-package/templates/function.template.html
index e530c3edb2..c97ae650ed 100644
--- a/public/api-builder/angular.io-package/templates/function.template.html
+++ b/public/api-builder/angular.io-package/templates/function.template.html
@@ -17,6 +17,6 @@
     defined in {$ githubViewLink(doc) $}
 
   :markdown
-{$ doc.description | indentNonMixin(4, true) | trimBlankLines $}
+{$ doc.description | indentForMarkdown(4) | trimBlankLines $}
 
 {% endblock %}
\ No newline at end of file
diff --git a/public/api-builder/angular.io-package/templates/var.template.html b/public/api-builder/angular.io-package/templates/var.template.html
index 3783424a00..5673b6fabc 100644
--- a/public/api-builder/angular.io-package/templates/var.template.html
+++ b/public/api-builder/angular.io-package/templates/var.template.html
@@ -8,5 +8,5 @@
     defined in {$ githubViewLink(doc) $}
 
   :markdown
-{$ doc.description | indentNonMixin(4, true) | trimBlankLines $}
+{$ doc.description | indentForMarkdown(4) | trimBlankLines $}
 {% endblock %}