2 files changed, 4 insertions, 3 deletions
diff --git a/lib/models/__tests__/page.js b/lib/models/__tests__/page.js
index 15a13ad..e75f8a8 100644
--- a/lib/models/__tests__/page.js
+++ b/lib/models/__tests__/page.js
@@ -20,7 +20,7 @@ describe('Page', function() {
                 })
             });
 
-            expect(page.toText()).toBe('---\nhello: world\n---\nHello World\n');
+            expect(page.toText()).toBe('---\nhello: world\n---\nHello World');
         });
     });
 });
diff --git a/lib/models/page.js b/lib/models/page.js
index 3f54f43..43a2c1f 100644
--- a/lib/models/page.js
+++ b/lib/models/page.js
@@ -1,5 +1,5 @@
 var Immutable = require('immutable');
-var matter = require('gray-matter');
+var yaml = require('js-yaml');;
 
 var File = require('./file');
 
@@ -44,7 +44,8 @@ Page.prototype.toText = function() {
         return content;
     }
 
-    return matter.stringify(content, attrs.toJS());
+    var frontMatter = '---\n' + yaml.safeDump(attrs.toJS(), { skipInvalid: true }) + '---\n';
+    return (frontMatter + content);
 };
 
 /**