diff --git a/README.md b/README.md
index ada6120..879762f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Looking for a desktop GUI version with pretty timelines and graphs? Check out [F
 - Runs on OS X, Linux, and Windows.
 - Store your resume data as a durable, versionable JSON, YML, or XML document.
 - Generate multiple targeted resumes in multiple formats, based on your needs.
-- Output to HTML, PDF, Markdown, Word, JSON, XML, or other arbitrary formats.
+- Output to HTML, PDF, Markdown, Word, JSON, YAML, XML, or a custom format.
 - Never update one piece of information in four different resumes again.
 - Compatible with the [JSON Resume standard][6] and [authoring tools][7].
 - Free and open-source through the MIT license.
@@ -39,7 +39,7 @@ fluentcmd [inputs] [outputs] [-t theme].
 Where `[inputs]` is one or more .json resume files, separated by spaces; `[outputs]` is one or more destination resumes, each prefaced with the `-o` option; and `[theme]` is the desired theme. For example:
 
 ```bash
-# Generate all resume formats (HTML, PDF, DOC, TXT)
+# Generate all resume formats (HTML, PDF, DOC, TXT, YML, etc.)
 fluentcmd resume.json -o out/resume.all -t modern
 
 # Generate a specific resume format
@@ -49,6 +49,7 @@ fluentcmd resume.json -o out/resume.md
 fluentcmd resume.json -o out/resume.doc
 fluentcmd resume.json -o out/resume.json
 fluentcmd resume.json -o out/resume.txt
+fluentcmd resume.json -o out/resume.yml
 
 # Specify 2 inputs and 3 outputs
 fluentcmd in1.json in2.json -o out.html -o out.doc -o out.pdf
@@ -57,7 +58,7 @@ fluentcmd in1.json in2.json -o out.html -o out.doc -o out.pdf
 You should see something to the effect of:
 
 ```
-*** FluentCMD v0.4.0 ***
+*** FluentCMD v0.5.0 ***
 Reading JSON resume: foo/resume.json
 Generating HTML resume: out/resume.html
 Generating TXT resume: out/resume.txt
@@ -78,7 +79,7 @@ fluentcmd resume.json -t modern
 fluentcmd resume.json -t ~/foo/bar/my-custom-theme/
 ```
 
-As of v0.4.0, available predefined themes are `modern`, `minimist`, and `hello-world`.
+As of v0.5.0, available predefined themes are `modern`, `minimist`, and `hello-world`.
 
 ### Merging resumes
 
diff --git a/package.json b/package.json
index 11570d4..3f04a31 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fluentcmd",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Generate beautiful, targeted resumes from your command line or shell.",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/fluentdesk/fluentcmd",
   "dependencies": {
-    "fluentlib": "fluentdesk/fluentlib#v0.3.0",
+    "fluentlib": "fluentdesk/fluentlib#v0.4.0",
     "minimist": "^1.2.0",
     "underscore": "^1.8.3"
   }
diff --git a/src/fluentcmd.js b/src/fluentcmd.js
index 9d8eced..4ffb627 100644
--- a/src/fluentcmd.js
+++ b/src/fluentcmd.js
@@ -26,7 +26,7 @@ module.exports = function () {
 
     _log = logger || console.log;
     _err = errHandler || error;
-    
+
     //_opts = extend( true, _opts, opts );
     _opts.theme = (opts.theme && opts.theme.toLowerCase().trim()) || 'modern';
     _opts.prettify = opts.prettify === true ? _opts.prettify : false;
@@ -96,8 +96,9 @@ module.exports = function () {
     { name: 'txt',  ext: 'txt', gen: new FLUENT.TextGenerator()  },
     { name: 'doc',  ext: 'doc',  fmt: 'xml', gen: new FLUENT.WordGenerator() },
     { name: 'pdf',  ext: 'pdf', fmt: 'html', is: false, gen: new FLUENT.HtmlPdfGenerator() },
-    { name: 'markdown',  ext: 'md', fmt: 'txt', gen: new FLUENT.MarkdownGenerator() },
-    { name: 'json', ext: 'json', gen: new FLUENT.JsonGenerator() }
+    { name: 'markdown', ext: 'md', fmt: 'txt', gen: new FLUENT.MarkdownGenerator() },
+    { name: 'json', ext: 'json', gen: new FLUENT.JsonGenerator() },
+    { name: 'yaml', ext: 'yml', fmt: 'yml', gen: new FLUENT.JsonYamlGenerator() }
   ];
 
   /**