diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..454d6cd
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: node_js
+node_js:
+  - "12.12"
+cache:
+  directories:
+    - node_modules
+branches:
+  only:
+    - master
+before_install:
+  - npm update
+install:
+  - npm ci
+script:
+  - npm run test
+  - npm run coveralls
+  - npm run build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd81f1f..cab3e57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,26 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 21-10-2019
+
+### Added
+
+- Markdown support.
+- Build command supports output folder option and args validation.
+- Travis CI integration.
+- Test coverage.
+
 ## [0.1.0] - 20-10-2019
+
 ### Added
+
 - Uses generic file types only.
-   Template system.
+- Template system.
 - Snippet system.
 - Progressive builds.
 - CSS minification.
-- Blog post, recent posts and archive.
\ No newline at end of file
+- Blog post, recent posts and archive.
diff --git a/README.md b/README.md
index c43dbd0..8cfcb20 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,29 @@
+[![TravisCI](https://travis-ci.com/pirobtumen/filler.svg?branch=master)](https://travis-ci.com/pirobtumen/filler)
+[![Coverage Status](https://coveralls.io/repos/github/pirobtumen/filler/badge.svg?branch=master)](https://coveralls.io/github/pirobtumen/filler?branch=master)
+
 # Filler
 
-1. Description
-2. Features & Roadmap
-3. Installation
-4. Commands
-5. Folder structure
-6. Template system
-7. Snippet system
-8. Blog system
-9. Contribute
-10. License
+Static web sites made easy.
+
+**Table of content**
+
+- [Filler](#filler)
+  - [Objective](#objective)
+  - [Features and Roadmap](#features-and-roadmap)
+- [Installation](#installation)
+  - [Commands](#commands)
+  - [Folder structure](#folder-structure)
+  - [Template system](#template-system)
+  - [Snippet system](#snippet-system)
+  - [Blog system](#blog-system)
+- [Contribute](#contribute)
+- [License](#license)
 
-## Static web sites made easy.
+## Objective
 
 Filler is a tool to create a static website using templates, reusing code and saving time. Its main purpose is to be as simple as possible to use.
 
-## Features & Roadmap
+## Features and Roadmap
 
 - [x] Uses generic file types only. [v0.1.0]
 - [x] Template system. [v0.1.0]
@@ -23,19 +31,26 @@ Filler is a tool to create a static website using templates, reusing code and sa
 - [x] Progressive builds (it only builds files that have changed, but you can `--force` it). [v0.1.0]
 - [x] CSS minification. [v0.1.0]
 - [x] Blog post, recent posts and archive. [v0.1.0]
-- [ ] Markdown support.
+- [x] Markdown support.
+- [ ] Improve logging system.
+- [ ] Improve error system.
+- [ ] Serve project: build in memory and watch for file changes.
+- [ ] Support saving into cloud storage (AWS S3, Google Cloud Storage...).
+- [ ] Example templates.
+- [ ] "init" command.
+- [ ] Multilingual sites.
 - [ ] Webpack support.
 - [ ] React support.
-- [ ] Serve project (build in memory and watch for file changes).
 - [ ] Server Side Rendering.
 - [ ] SEO features.
 - [ ] Any proposal? Contribute!
 
-## Installation
+# Installation
 
-Install node [[Download link](https://nodejs.org/en/download/)] [Tested version 12.12]
+Install node [[Download link](https://nodejs.org/en/download/)][tested version 12.12]
 
 Install filler:
+
 ```
 git clone https://github.com/pirobtumen/filler.git
 cd filler
@@ -47,11 +62,12 @@ node filler --help
 ## Commands
 
 - build \<folder\> [OPTIONS]
+
   - folder: project folder path. E.g.: "~/Projects/myweb".
-  - --force: force build all files.
-  - --mode [dev, prod]: build mode. Replace specifi snippets.
-  - --recentPosts [number]: number of recent posts rendered.
-  
+  - --output: output folder path. Default: ./dist
+  - --force: force build all files. Default: false
+  - --mode [dev, prod]: build mode. Replace specific snippets. Default: dev
+  - --recentPosts [number]: number of recent posts rendered. Default: 5
 
 ## Folder structure
 
@@ -74,13 +90,14 @@ Create the following file structure:
     - /styles
       - styles.css
 ```
+
 Build command for development:
 
 `node filler ~/Projects/myweb`
 
 Build command for production (injects analytics):
 
-`node filler ~/Projects/myweb`
+`node filler ~/Projects/myweb --mode prod`
 
 The output folder will contain:
 
@@ -98,7 +115,7 @@ The output folder will contain:
 
 ## Template system
 
-The files inside the public folder can use any template created inside the `/templates` folder. The idea is to set the property `@template <template filename>` inside a comment in the top part  of the file. Let's see an example:
+The files inside the public folder can use any template created inside the `/templates` folder. The idea is to set the property `@template <template filename>` inside a comment in the top part of the file. Let's see an example:
 
 ```
 File: ./public/index.html
@@ -108,6 +125,7 @@ File: ./public/index.html
 
 I'm the main web page!!
 ```
+
 ```
 File: ./templates/main.html
 <div>
@@ -127,6 +145,7 @@ I'm the main web page!!
 ## Snippet system
 
 Currently there are only two supported snippets:
+
 - /snippets/scripts.html: replaced in every mode.
 - /snippets/analytics.html: replaced only in `prod` mod.
 
@@ -156,7 +175,7 @@ I'm the main web page!!
 
 ## Blog system
 
-The files inside the `/post` folder can use any template created inside the `/templates` folder. The idea is to set the parameter `@template <template filename>` inside a comment in the top part  of the file. It will also have some extra properties: `@title`, `@description`, `@author` and `@date (dd-mm-yyyyy)`. These properties are used to build the `{{blog:recent-post}}` and `{{blog:archive}}`.
+The files inside the `/post` folder can use any template created inside the `/templates` folder. The idea is to set the parameter `@template <template filename>` inside a comment in the top part of the file. It will also have some extra properties: `@title`, `@description`, `@author` and `@date (dd-mm-yyyyy)`. These properties are used to build the `{{blog:recent-post}}` and `{{blog:archive}}`.
 
 ```
 File: ./post/my-first-post.html
@@ -171,9 +190,9 @@ File: ./post/my-first-post.html
 My firs blog post content
 ```
 
-If you want to use `{{blog:recent-posts}}` or `{{blog:archive}}`, you need to create the `/template/recentPost.html` or `template/archivePost.html` template in  order to render them. For example:
+If you want to use `{{blog:recent-posts}}` or `{{blog:archive}}`, you need to create the `/template/recentPost.html` or `template/archivePost.html` template in order to render them. For example:
 
-Then you can insert the markups `{{blog:recent-posts}}`  or `{{blog:archive}}` where you want, for example in the main page:
+Then you can insert the markups `{{blog:recent-posts}}` or `{{blog:archive}}` where you want, for example in the main page:
 
 ```
 Result: ./dist/index.html
@@ -186,13 +205,13 @@ I'm the main web page!!
 
 You can control the number of recent post displayed with the `build --recentPosts <number>` argument.
 
-## Contribute
+# Contribute
 
 Feel free to:
 
 - Submit bugs/features.
 - Open a Pull Request with some fix/feature.
 
-## License
+# License
 
 Filler is distributed under BSD 3-Clause license. Check the LICENSE.md file.
diff --git a/jest.config.js b/jest.config.js
index 22692fb..e960d46 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,8 +1,9 @@
 module.exports = {
-  "roots": [
-    "<rootDir>/test"
-  ],
-  "transform": {
-    "^.+\\.ts$": "ts-jest"
+  collectCoverage: true,
+  verbose: true,
+  collectCoverageFrom: ['src/**/*.ts'],
+  transform: {
+    "^.+\\.tsx?$": "ts-jest",
   },
+  testRegex: "(./tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index ed4c847..b2d3a3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "filler",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -471,6 +471,12 @@
       "integrity": "sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==",
       "dev": true
     },
+    "@types/marked": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.6.5.tgz",
+      "integrity": "sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA==",
+      "dev": true
+    },
     "@types/node": {
       "version": "12.11.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-12.11.1.tgz",
@@ -561,12 +567,14 @@
     "ansi-regex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
       }
@@ -910,7 +918,8 @@
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -971,6 +980,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
       "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "dev": true,
       "requires": {
         "string-width": "^3.1.0",
         "strip-ansi": "^5.2.0",
@@ -997,6 +1007,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -1004,7 +1015,8 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
     },
     "combined-stream": {
       "version": "1.0.8",
@@ -1055,6 +1067,20 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
+    "coveralls": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.7.tgz",
+      "integrity": "sha512-mUuH2MFOYB2oBaA4D4Ykqi9LaEYpMMlsiOMJOrv358yAjP6enPIk55fod2fNJ8AvwoYXStWQls37rA+s5e7boA==",
+      "dev": true,
+      "requires": {
+        "growl": "~> 1.10.0",
+        "js-yaml": "^3.13.1",
+        "lcov-parse": "^0.0.10",
+        "log-driver": "^1.2.7",
+        "minimist": "^1.2.0",
+        "request": "^2.86.0"
+      }
+    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -1128,7 +1154,8 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -1238,7 +1265,8 @@
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
     },
     "end-of-stream": {
       "version": "1.4.4",
@@ -1552,6 +1580,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
       "requires": {
         "locate-path": "^3.0.0"
       }
@@ -2151,7 +2180,8 @@
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
     },
     "get-stream": {
       "version": "4.1.0",
@@ -2203,6 +2233,12 @@
       "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
       "dev": true
     },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
     "growly": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
@@ -2467,7 +2503,8 @@
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
     },
     "is-generator-fn": {
       "version": "2.1.0",
@@ -3150,6 +3187,24 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+          "dev": true
+        }
+      }
+    },
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
@@ -3253,6 +3308,12 @@
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true
     },
+    "lcov-parse": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz",
+      "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=",
+      "dev": true
+    },
     "left-pad": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
@@ -3291,6 +3352,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
       "requires": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -3314,6 +3376,12 @@
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "dev": true
     },
+    "log-driver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
+      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
+      "dev": true
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -3371,6 +3439,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "marked": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
+      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
+    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -3722,6 +3795,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
       "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+      "dev": true,
       "requires": {
         "p-try": "^2.0.0"
       }
@@ -3730,6 +3804,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
       "requires": {
         "p-limit": "^2.0.0"
       }
@@ -3743,7 +3818,8 @@
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
     },
     "parse-json": {
       "version": "4.0.0",
@@ -3770,7 +3846,8 @@
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
@@ -4030,12 +4107,14 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
     },
     "require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
     },
     "resolve": {
       "version": "1.12.0",
@@ -4141,7 +4220,8 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
     },
     "set-value": {
       "version": "2.0.1",
@@ -4480,6 +4560,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
       "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+      "dev": true,
       "requires": {
         "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
@@ -4510,6 +4591,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
       "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+      "dev": true,
       "requires": {
         "ansi-regex": "^4.1.0"
       }
@@ -4898,7 +4980,8 @@
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
     },
     "wordwrap": {
       "version": "0.0.3",
@@ -4910,6 +4993,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
       "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^3.2.0",
         "string-width": "^3.0.0",
@@ -4951,34 +5035,8 @@
     "y18n": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
-    },
-    "yargs": {
-      "version": "14.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.0.tgz",
-      "integrity": "sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==",
-      "requires": {
-        "cliui": "^5.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^15.0.0"
-      }
-    },
-    "yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==",
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
     },
     "yn": {
       "version": "3.1.1",
diff --git a/package.json b/package.json
index 465c8ff..54fedda 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "filler",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "./src/index.js",
   "scripts": {
     "filler": "ts-node ./src/index.ts",
     "build": "rm -rf ./filler; tsc",
-    "test": "jest --coverage --verbose"
+    "test": "jest",
+    "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
   "repository": {
     "type": "git",
@@ -14,18 +15,19 @@
   "author": "Alberto Sola",
   "dependencies": {
     "argparse": "^1.0.10",
-    "uglifycss": "0.0.29",
-    "yargs": "14.2.0"
+    "marked": "^0.7.0",
+    "uglifycss": "0.0.29"
   },
   "devDependencies": {
     "@types/argparse": "^1.0.36",
     "@types/jest": "^24.0.18",
+    "@types/marked": "^0.6.5",
     "@types/node": "^12.7.1",
     "@types/uglifycss": "0.0.5",
-    "@types/yargs": "^13.0.3",
+    "coveralls": "^3.0.7",
     "jest": "^24.9.0",
     "ts-jest": "^24.1.0",
     "ts-node": "^8.3.0",
     "typescript": "^3.5.3"
   }
-}
+}
\ No newline at end of file
diff --git a/src/domain/builder/builder.ts b/src/domain/builder/builder.ts
index 1b4064f..7e18b81 100644
--- a/src/domain/builder/builder.ts
+++ b/src/domain/builder/builder.ts
@@ -1,5 +1,7 @@
-import { IBuilder, IFile, IStore } from "../../interfaces";
-import { cssBuilder, htmlBuilder } from "./builders";
+import { IBuilder, IFile, ICache } from "../../interfaces";
+import { cssBuilder, htmlBuilder, markdownBuilder } from "./builders";
+import { join } from "path";
+import { DirScanner } from "../../lib/dir-scanner";
 
 export interface IBuilders {
   [key: string]: IBuilder;
@@ -7,21 +9,39 @@ export interface IBuilders {
 
 export const defaultBuilders = {
   html: htmlBuilder,
-  css: cssBuilder
+  css: cssBuilder,
+  md: markdownBuilder
 };
 
 export class Builder {
-  private store: IStore;
+  private cache: ICache;
   private builders: IBuilders;
 
-  constructor(store: IStore, builders: IBuilders) {
-    this.store = store;
+  constructor(cache: ICache, builders: IBuilders) {
+    this.cache = cache;
     this.builders = builders;
   }
 
   public async buildFile(file: IFile) {
     const builder = this.builders[file.extension];
-    if (builder) return builder(this.store, file);
+    if (builder) return builder(this.cache, file);
     else return file;
   }
+
+  public async build() {
+    const config = this.cache.get("config");
+    const publicFolder = join(config.projectFolder, config.publicFolder);
+    const posts = this.cache.get("posts").map((p: IFile) => ({
+      ...p,
+      path: config.postsFolder
+    }));
+
+    const publicFiles = await Promise.all(
+      [...(await DirScanner.scanAndGetFiles(publicFolder)), ...posts].map(pf =>
+        this.buildFile(pf)
+      )
+    );
+
+    return publicFiles;
+  }
 }
diff --git a/src/domain/builder/builders/css.builder.ts b/src/domain/builder/builders/css.builder.ts
index c638e10..3ab0087 100644
--- a/src/domain/builder/builders/css.builder.ts
+++ b/src/domain/builder/builders/css.builder.ts
@@ -1,8 +1,8 @@
 import { processString as uglifyCssString } from "uglifycss";
 
-import { IBuilder, IFile, IStore } from "../../../interfaces";
+import { IBuilder, IFile, ICache } from "../../../interfaces";
 
-export const cssBuilder: IBuilder = async (store: IStore, file: IFile) => {
+export const cssBuilder: IBuilder = async (cache: ICache, file: IFile) => {
   const newFile = { ...file };
   newFile.raw = uglifyCssString(file.raw.toString());
   return newFile;
diff --git a/src/domain/builder/builders/html.builder.ts b/src/domain/builder/builders/html.builder.ts
index 318c020..daead64 100644
--- a/src/domain/builder/builders/html.builder.ts
+++ b/src/domain/builder/builders/html.builder.ts
@@ -1,10 +1,10 @@
-import { IBuilder, IFile, IStore, IPostMetadata } from "../../../interfaces";
+import { IBuilder, IFile, ICache, IPostMetadata } from "../../../interfaces";
 import { getFileMetadata } from "../../builder";
 
-export const htmlBuilder: IBuilder = async (store: IStore, file: IFile) => {
-  const config = store.get("config");
-  const templates = store.get("templates");
-  const snippets = store.get("snippets");
+export const htmlBuilder: IBuilder = async (cache: ICache, file: IFile) => {
+  const config = cache.get("config");
+  const templates = cache.get("templates");
+  const snippets = cache.get("snippets");
 
   const newFile = { ...file };
   const { metadata, html: content } = getFileMetadata(newFile);
@@ -23,12 +23,12 @@ export const htmlBuilder: IBuilder = async (store: IStore, file: IFile) => {
 
   const recentPosts = output.match(/{{blog:recent-posts}}/g);
   if (recentPosts) {
-    output = output.replace("{{blog:recent-posts}}", buildRecentPosts(store));
+    output = output.replace("{{blog:recent-posts}}", buildRecentPosts(cache));
   }
 
   const archive = output.match(/{{blog:archive}}/g);
   if (archive) {
-    output = output.replace("{{blog:archive}}", buildArchive(store));
+    output = output.replace("{{blog:archive}}", buildArchive(cache));
   }
 
   const templateSnippets = output.match(/{{snippet:([a-z0-9-]*)}}/g);
@@ -83,10 +83,10 @@ const sortPosts = (p1: IPostMetadata, p2: IPostMetadata) => {
   else return 1;
 };
 
-const buildRecentPosts = (store: IStore) => {
-  const config = store.get("config");
-  const posts = store.get("posts");
-  const { recentPost: recentPostTemplate } = store.get("templates");
+const buildRecentPosts = (cache: ICache) => {
+  const config = cache.get("config");
+  const posts = cache.get("posts");
+  const { recentPost: recentPostTemplate } = cache.get("templates");
 
   if (!recentPostTemplate) {
     throw new Error("There is no template for recent posts.");
@@ -100,9 +100,9 @@ const buildRecentPosts = (store: IStore) => {
     .join("");
 };
 
-const buildArchive = (store: IStore) => {
-  const posts = store.get("posts");
-  const { archivePost: archiveTemplate } = store.get("templates");
+const buildArchive = (cache: ICache) => {
+  const posts = cache.get("posts");
+  const { archivePost: archiveTemplate } = cache.get("templates");
 
   if (!archiveTemplate) {
     throw new Error("There is no template for archive.");
diff --git a/src/domain/builder/builders/index.ts b/src/domain/builder/builders/index.ts
index 48ba539..00225c0 100644
--- a/src/domain/builder/builders/index.ts
+++ b/src/domain/builder/builders/index.ts
@@ -1,2 +1,3 @@
 export * from "./css.builder";
 export * from "./html.builder";
+export * from "./markdown.builder";
diff --git a/src/domain/builder/builders/markdown.builder.ts b/src/domain/builder/builders/markdown.builder.ts
new file mode 100644
index 0000000..50bca13
--- /dev/null
+++ b/src/domain/builder/builders/markdown.builder.ts
@@ -0,0 +1,27 @@
+import { parse } from "marked";
+
+import { IBuilder, IFile, ICache } from "../../../interfaces";
+import { htmlBuilder } from "./html.builder";
+
+const parseMarkdown = async (markdown: string) => {
+  return new Promise<string>((resolve, rejects) => {
+    parse(markdown, (error, result) => {
+      if (error) return rejects(error);
+      resolve(result);
+    });
+  });
+};
+
+export const markdownBuilder: IBuilder = async (cache: ICache, file: IFile) => {
+  const nameParts = file.name.split(".");
+  nameParts[nameParts.length - 1] = "html";
+
+  const newFile: IFile = {
+    ...file,
+    name: nameParts.join("."),
+    extension: "html",
+    raw: await parseMarkdown(file.raw.toString())
+  };
+
+  return htmlBuilder(cache, newFile);
+};
diff --git a/src/domain/filler/index.ts b/src/domain/loader/index.ts
similarity index 50%
rename from src/domain/filler/index.ts
rename to src/domain/loader/index.ts
index b563423..ee5286f 100644
--- a/src/domain/filler/index.ts
+++ b/src/domain/loader/index.ts
@@ -1,2 +1 @@
-export * from "./filler";
 export * from "./loader";
diff --git a/src/domain/filler/loader.ts b/src/domain/loader/loader.ts
similarity index 80%
rename from src/domain/filler/loader.ts
rename to src/domain/loader/loader.ts
index dbffb02..1b4409c 100644
--- a/src/domain/filler/loader.ts
+++ b/src/domain/loader/loader.ts
@@ -1,6 +1,6 @@
 import { join } from "path";
 
-import { IStore, IConfig } from "../../interfaces";
+import { ICache } from "../../interfaces";
 import { DirScanner } from "../../lib/dir-scanner";
 import { readFile } from "../../lib/io";
 
@@ -10,10 +10,10 @@ interface IVar {
 }
 
 export class Loader {
-  private store: IStore;
+  private cache: ICache;
 
-  constructor(store: IStore) {
-    this.store = store;
+  constructor(cache: ICache) {
+    this.cache = cache;
   }
 
   public async init() {
@@ -23,13 +23,13 @@ export class Loader {
       this.loadPosts()
     ]);
 
-    this.store.set("templates", templates);
-    this.store.set("snippets", snippets);
-    this.store.set("posts", posts);
+    this.cache.set("templates", templates);
+    this.cache.set("snippets", snippets);
+    this.cache.set("posts", posts);
   }
 
   private async loadTemplates() {
-    const config = this.store.get("config");
+    const config = this.cache.get("config");
     const templates: { [key: string]: string } = {};
     const templateFolder = join(config.projectFolder, config.templateFolder);
     try {
@@ -47,7 +47,7 @@ export class Loader {
   }
 
   private async loadSnippets() {
-    const config = this.store.get("config");
+    const config = this.cache.get("config");
     const snippets: {
       [key: string]: IVar;
     } = {};
@@ -69,7 +69,7 @@ export class Loader {
   }
 
   private async loadPosts() {
-    const config = this.store.get("config");
+    const config = this.cache.get("config");
     const postsFolder = join(config.projectFolder, config.postsFolder);
     try {
       return await DirScanner.scanAndGetFiles(postsFolder);
diff --git a/src/domain/storer/index.ts b/src/domain/storer/index.ts
new file mode 100644
index 0000000..ed24092
--- /dev/null
+++ b/src/domain/storer/index.ts
@@ -0,0 +1 @@
+export * from "./storer";
diff --git a/src/domain/filler/filler.ts b/src/domain/storer/storer.ts
similarity index 58%
rename from src/domain/filler/filler.ts
rename to src/domain/storer/storer.ts
index 6dc00f5..5195c4f 100644
--- a/src/domain/filler/filler.ts
+++ b/src/domain/storer/storer.ts
@@ -1,23 +1,21 @@
-import { writeFileSync, readFileSync } from "fs";
 import { join } from "path";
 
+import { ICache, IFile } from "../../interfaces";
 import { DirScanner } from "../../lib/dir-scanner";
 import { mkdir, unlink } from "../../lib/io";
-import { IFile, IStore } from "../../interfaces";
-import { Builder } from "../builder";
+import { writeFileSync } from "fs";
 
-export class Filler {
-  private store: IStore;
-  private builder: Builder;
+export class Storer {
+  private cache: ICache;
 
-  constructor(store: IStore, builder: Builder) {
-    this.store = store;
-    this.builder = builder;
+  constructor(cache: ICache) {
+    this.cache = cache;
   }
 
   private async saveFile(file: IFile) {
-    const config = this.store.get("config");
+    const config = this.cache.get("config");
     const outFolder = join(config.distFolder, file.path);
+
     try {
       await mkdir(outFolder, { recursive: true });
     } catch (e) {
@@ -35,35 +33,24 @@ export class Filler {
     writeFileSync(outFilePath, content);
   }
 
-  public async build() {
-    const config = this.store.get("config");
-    const publicFolder = join(config.projectFolder, config.publicFolder);
+  public async save(files: Array<IFile>) {
+    const config = this.cache.get("config");
     let filesUpdated = 0;
 
-    const posts = this.store.get("posts").map((p: IFile) => ({
-      ...p,
-      path: config.postsFolder
-    }));
-
     await mkdir(config.distFolder, { recursive: true });
     const distFiles = await DirScanner.scanAndGetFiles(config.distFolder);
-    const publicFiles = [
-      ...(await DirScanner.scanAndGetFiles(publicFolder)),
-      ...posts
-    ];
 
-    for (const pf of publicFiles) {
+    for (const f of files) {
       const distFileIndex = distFiles.findIndex(
-        df => df.name === pf.name && df.path === pf.path
+        df => df.name === f.name && df.path === f.path
       );
 
       if (
         distFileIndex === -1 ||
-        pf.modifiedAt > distFiles[distFileIndex].modifiedAt ||
+        f.modifiedAt > distFiles[distFileIndex].modifiedAt ||
         config.force
       ) {
-        const file = await this.builder.buildFile(pf);
-        this.saveFile(file);
+        this.saveFile(f);
         filesUpdated += 1;
       }
 
diff --git a/src/index.ts b/src/index.ts
index 39e16c8..f86bf16 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -23,7 +23,8 @@ buildCmd.addArgument(["folder"]);
 buildCmd.addArgument(["--mode"], {
   action: "store",
   help: "Build mode",
-  defaultValue: "dev"
+  type: "string",
+  choices: ["dev", "prod"]
 });
 buildCmd.addArgument(["--force"], {
   action: "storeTrue",
@@ -31,19 +32,31 @@ buildCmd.addArgument(["--force"], {
 });
 buildCmd.addArgument(["--recentPosts"], {
   action: "store",
-  help: "Number of recent posts to render"
+  help: "Number of recent posts to render",
+  type: "int"
+});
+buildCmd.addArgument(["--output", "-o"], {
+  action: "store",
+  help: "Output folder",
+  type: "string"
 });
 
 const args = parser.parseArgs();
 switch (args.command) {
   case "build":
-    // TODO Validation
     const config: Partial<IConfig> = {
-      mode: args.mode,
       force: args.force,
       projectFolder: args.folder
     };
 
+    if (args.mode) {
+      config.mode = args.mode;
+    }
+
+    if (args.output) {
+      config.distFolder = args.output;
+    }
+
     if (args.recentPosts) {
       config.recentPosts = args.recentPosts;
     }
diff --git a/src/interfaces/builder.interface.ts b/src/interfaces/builder.interface.ts
index aec5989..8744635 100644
--- a/src/interfaces/builder.interface.ts
+++ b/src/interfaces/builder.interface.ts
@@ -1,7 +1,7 @@
-import { IFile, IStore } from ".";
+import { IFile, ICache } from ".";
 
 export interface IBuilder {
-  (store: IStore, file: IFile): Promise<IFile>;
+  (cache: ICache, file: IFile): Promise<IFile>;
 }
 
 export interface IFileMetadata {
diff --git a/src/interfaces/store.interface.ts b/src/interfaces/cache.interface.ts
similarity index 73%
rename from src/interfaces/store.interface.ts
rename to src/interfaces/cache.interface.ts
index 9ccb62f..c670940 100644
--- a/src/interfaces/store.interface.ts
+++ b/src/interfaces/cache.interface.ts
@@ -1,4 +1,4 @@
-export interface IStore {
+export interface ICache {
   set: (key: string, value: any) => void;
   get: (key: string) => any;
 }
diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
index d8bf05a..236e9b3 100644
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -1,4 +1,4 @@
 export * from "./builder.interface";
 export * from "./dir-scanner.interface";
-export * from "./store.interface";
+export * from "./cache.interface";
 export * from "./config.interface";
diff --git a/src/lib/cache/index.ts b/src/lib/cache/index.ts
new file mode 100644
index 0000000..33dac29
--- /dev/null
+++ b/src/lib/cache/index.ts
@@ -0,0 +1 @@
+export * from "./memory";
diff --git a/src/lib/store/store.ts b/src/lib/cache/memory.ts
similarity index 67%
rename from src/lib/store/store.ts
rename to src/lib/cache/memory.ts
index 0cf5eee..dc8efdc 100644
--- a/src/lib/store/store.ts
+++ b/src/lib/cache/memory.ts
@@ -1,6 +1,6 @@
-import { IStore } from "../../interfaces";
+import { ICache } from "../../interfaces";
 
-export class Store implements IStore {
+export class MemoryCache implements ICache {
   private data: { [key: string]: any } = {};
 
   public set(key: string, value: any) {
diff --git a/src/lib/filler/filler.ts b/src/lib/filler/filler.ts
deleted file mode 100644
index a0fa818..0000000
--- a/src/lib/filler/filler.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { writeFileSync, readFileSync } from "fs";
-import { join } from "path";
-
-import { DirScanner } from "../dir-scanner";
-import { mkdir, unlink } from "../io";
-import { IFile, IStore } from "../../interfaces";
-import { Builder } from "../../domain/builder";
-
-export class Filler {
-  private store: IStore;
-  private builder: Builder;
-
-  constructor(store: IStore, builder: Builder) {
-    this.store = store;
-    this.builder = builder;
-  }
-
-  private async saveFile(file: IFile) {
-    const config = this.store.get("config");
-    const outFolder = join(config.distFolder, file.path);
-    try {
-      await mkdir(outFolder, { recursive: true });
-    } catch (e) {
-      console.log(e);
-    }
-
-    const content = file.raw;
-    if (!content) {
-      // TODO Show warnings at the end of the file
-      console.log(`WARNING: Empty file ${file.path} `);
-    }
-
-    const outFilePath = join(outFolder, file.name);
-    console.log(`+ ${outFilePath}`);
-    writeFileSync(outFilePath, content);
-  }
-
-  public async build() {
-    const config = this.store.get("config");
-    const publicFolder = join(config.projectFolder, config.publicFolder);
-    let filesUpdated = 0;
-
-    const posts = this.store.get("posts").map((p: IFile) => ({
-      ...p,
-      path: config.postsFolder
-    }));
-
-    await mkdir(config.distFolder, { recursive: true });
-    const distFiles = await DirScanner.scanAndGetFiles(config.distFolder);
-    const publicFiles = [
-      ...(await DirScanner.scanAndGetFiles(publicFolder)),
-      ...posts
-    ];
-
-    for (const pf of publicFiles) {
-      const distFileIndex = distFiles.findIndex(
-        df => df.name === pf.name && df.path === pf.path
-      );
-
-      if (
-        distFileIndex === -1 ||
-        pf.modifiedAt > distFiles[distFileIndex].modifiedAt ||
-        config.force
-      ) {
-        const file = await this.builder.buildFile(pf);
-        this.saveFile(file);
-        filesUpdated += 1;
-      }
-
-      if (distFileIndex > -1) {
-        distFiles.splice(distFileIndex, 1);
-      }
-    }
-
-    for (const f of distFiles) {
-      const filePath = join(config.distFolder, f.path, f.name);
-      await unlink(filePath);
-      console.log(`- ${filePath}`);
-      filesUpdated += 1;
-    }
-
-    if (filesUpdated === 0) {
-      console.log("WARNING: There are no changes.");
-    }
-  }
-}
diff --git a/src/lib/store/index.ts b/src/lib/store/index.ts
deleted file mode 100644
index f5990c2..0000000
--- a/src/lib/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./store";
diff --git a/src/use-cases/build/build.ts b/src/use-cases/build/build.ts
index 2e4a6d4..0237236 100644
--- a/src/use-cases/build/build.ts
+++ b/src/use-cases/build/build.ts
@@ -1,17 +1,19 @@
-import { IConfig } from "../../interfaces";
-import { Store } from "../../lib/store";
-import { Filler, Loader } from "../../domain/filler";
-import { Builder, defaultBuilders } from "../../domain/builder";
 import { defaultConfig } from "./config.default";
+import { Builder, defaultBuilders } from "../../domain/builder";
+import { Loader } from "../../domain/loader";
+import { Storer } from "../../domain/storer";
+import { IConfig } from "../../interfaces";
+import { MemoryCache } from "../../lib/cache";
 
 export async function build(config: Partial<IConfig>) {
-  const store = new Store();
-  store.set("config", { ...defaultConfig, ...config });
+  const cache = new MemoryCache();
+  const loader = new Loader(cache);
+  const builder = new Builder(cache, defaultBuilders);
+  const storer = new Storer(cache);
 
-  const loader = new Loader(store);
+  cache.set("config", { ...defaultConfig, ...config });
   await loader.init();
 
-  const builder = new Builder(store, defaultBuilders);
-  const filler = new Filler(store, builder);
-  await filler.build();
+  const files = await builder.build();
+  await storer.save(files);
 }
diff --git a/test/unit/builder.css.test.ts b/test/unit/builder.css.test.ts
index 87493a7..6771b12 100644
--- a/test/unit/builder.css.test.ts
+++ b/test/unit/builder.css.test.ts
@@ -1,13 +1,13 @@
 jest.mock("uglifycss");
 import { processString } from "uglifycss";
 
-import { Store } from "../../src/lib/store";
+import { MemoryCache } from "../../src/lib/cache";
 import { IFile } from "../../src/interfaces";
 import { cssBuilder } from "../../src/domain/builder/builders";
 
 describe("Builder - CSS", () => {
   test("Uglify css", async () => {
-    const store = new Store();
+    const cache = new MemoryCache();
     const fakeFile: IFile = {
       name: "style.css",
       extension: "css",
@@ -16,7 +16,7 @@ describe("Builder - CSS", () => {
       raw: "hello { fake-css: 1234; }"
     };
 
-    const output = await cssBuilder(store, fakeFile);
+    await cssBuilder(cache, fakeFile);
     expect(processString).toHaveBeenCalled();
   });
 });
diff --git a/test/unit/builder.html.test.ts b/test/unit/builder.html.test.ts
index 041b8b8..04b74e6 100644
--- a/test/unit/builder.html.test.ts
+++ b/test/unit/builder.html.test.ts
@@ -1,11 +1,11 @@
-import { Store } from "../../src/lib/store";
+import { MemoryCache } from "../../src/lib/cache";
 import { IFile } from "../../src/interfaces";
 import { htmlBuilder } from "../../src/domain/builder/builders";
 import { DirScanner } from "../../src/lib/dir-scanner";
 
 describe("Builder - HTML", () => {
   test("Builds file without template", async () => {
-    const store = new Store();
+    const cache = new MemoryCache();
     const fakeFile: IFile = {
       name: "article.html",
       extension: "html",
@@ -19,13 +19,13 @@ describe("Builder - HTML", () => {
       raw: " <p>test</p>"
     };
 
-    const output = await htmlBuilder(store, fakeFile);
+    const output = await htmlBuilder(cache, fakeFile);
     expect(output).toMatchObject(result);
   });
 
   test("Template not found", async () => {
-    const store = new Store();
-    store.set("templates", {});
+    const cache = new MemoryCache();
+    cache.set("templates", {});
     const fakeFile: IFile = {
       name: "article.html",
       extension: "html",
@@ -34,14 +34,14 @@ describe("Builder - HTML", () => {
       raw: "<!--\n @template main \n--> <p>test</p>"
     };
 
-    return expect(htmlBuilder(store, fakeFile)).rejects.toEqual(
+    return expect(htmlBuilder(cache, fakeFile)).rejects.toEqual(
       new Error("Template main not found.")
     );
   });
 
   test("Replace content correctly", async () => {
-    const store = new Store();
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("templates", {
       main: "<div>{{content}}</div>"
     });
 
@@ -58,17 +58,17 @@ describe("Builder - HTML", () => {
       raw: "<div> <p>test</p></div>"
     };
 
-    const output = await htmlBuilder(store, fakeFile);
+    const output = await htmlBuilder(cache, fakeFile);
     expect(output).toMatchObject(result);
   });
 
   test("Replace snippets inside template correctly", async () => {
-    const store = new Store();
-    store.set("config", { mode: "prod" });
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("config", { mode: "prod" });
+    cache.set("templates", {
       main: "<div>{{snippet:myvar1}}{{content}}</div>"
     });
-    store.set("snippets", {
+    cache.set("snippets", {
       myvar1: { configMode: "all", value: "ABCD" },
       myvar2: { configMode: "all", value: "XYZA" }
     });
@@ -86,17 +86,17 @@ describe("Builder - HTML", () => {
       raw: "<div>ABCD <p>XYZA</p></div>"
     };
 
-    const output = await htmlBuilder(store, fakeFile);
+    const output = await htmlBuilder(cache, fakeFile);
     expect(output).toMatchObject(result);
   });
 
   test("Replace snippets configMode", async () => {
-    const store = new Store();
-    store.set("config", { mode: "prod" });
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("config", { mode: "prod" });
+    cache.set("templates", {
       main: "<div>{{snippet:myvar1}}{{content}}{{snippet:myvar3}}</div>"
     });
-    store.set("snippets", {
+    cache.set("snippets", {
       myvar1: { configMode: "prod", value: "ABCD" },
       myvar2: { configMode: "dev", value: "XYZA" },
       myvar3: { configMode: "all", value: "always" }
@@ -115,17 +115,17 @@ describe("Builder - HTML", () => {
       raw: "<div>ABCD <p></p>always</div>"
     };
 
-    const output = await htmlBuilder(store, fakeFile);
+    const output = await htmlBuilder(cache, fakeFile);
     expect(output).toMatchObject(result);
   });
 
   test("No recent post template file", async () => {
-    const store = new Store();
-    store.set("config", { recentPosts: 2 });
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("config", { recentPosts: 2 });
+    cache.set("templates", {
       main: "<div>{{content}}</div>"
     });
-    store.set("posts", DirScanner.scanAndGetFiles("./test/data/project/posts"));
+    cache.set("posts", DirScanner.scanAndGetFiles("./test/data/project/posts"));
 
     const fakeFile: IFile = {
       name: "article.html",
@@ -135,20 +135,20 @@ describe("Builder - HTML", () => {
       raw: "<!--\n @template main \n--> <div>{{blog:recent-posts}}</div>"
     };
 
-    return expect(htmlBuilder(store, fakeFile)).rejects.toThrow(
+    return expect(htmlBuilder(cache, fakeFile)).rejects.toThrow(
       new Error("There is no template for recent posts.")
     );
   });
 
   test("Recent posts", async () => {
-    const store = new Store();
-    store.set("config", { recentPosts: 2 });
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("config", { recentPosts: 2 });
+    cache.set("templates", {
       main: "<div>{{content}}</div>",
       recentPost:
         "<div>{{title}}</div><p>{{author}}</p><p>{{description}}</p><p>{{date}}</p>"
     });
-    store.set(
+    cache.set(
       "posts",
       await DirScanner.scanAndGetFiles("./test/data/project/posts")
     );
@@ -167,18 +167,18 @@ describe("Builder - HTML", () => {
         "<div> <div><div>Fourth post</div><p>Test</p><p>Fourth blog test</p><p>04-01-2019</p><div>Third post</div><p>Test</p><p>Third blog test</p><p>03-01-2019</p></div></div>"
     };
 
-    const output = await htmlBuilder(store, fakeFile);
+    const output = await htmlBuilder(cache, fakeFile);
     expect(output).toMatchObject(result);
   });
 
   test("Recent posts - use partial metadata", async () => {
-    const store = new Store();
-    store.set("config", { recentPosts: 2 });
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("config", { recentPosts: 2 });
+    cache.set("templates", {
       main: "<div>{{content}}</div>",
       recentPost: "<div>{{title}}</div><p>{{author}}</p>"
     });
-    store.set(
+    cache.set(
       "posts",
       await DirScanner.scanAndGetFiles("./test/data/project/posts")
     );
@@ -197,16 +197,16 @@ describe("Builder - HTML", () => {
         "<div> <div><div>Fourth post</div><p>Test</p><div>Third post</div><p>Test</p></div></div>"
     };
 
-    const output = await htmlBuilder(store, fakeFile);
+    const output = await htmlBuilder(cache, fakeFile);
     expect(output).toMatchObject(result);
   });
 
   test("No archive post template file", async () => {
-    const store = new Store();
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("templates", {
       main: "<div>{{content}}</div>"
     });
-    store.set("posts", DirScanner.scanAndGetFiles("./test/data/project/posts"));
+    cache.set("posts", DirScanner.scanAndGetFiles("./test/data/project/posts"));
 
     const fakeFile: IFile = {
       name: "article.html",
@@ -216,18 +216,18 @@ describe("Builder - HTML", () => {
       raw: "<!--\n @template main \n--> <div>{{blog:archive}}</div>"
     };
 
-    return expect(htmlBuilder(store, fakeFile)).rejects.toThrow(
+    return expect(htmlBuilder(cache, fakeFile)).rejects.toThrow(
       new Error("There is no template for archive.")
     );
   });
 
   test("Archive", async () => {
-    const store = new Store();
-    store.set("templates", {
+    const cache = new MemoryCache();
+    cache.set("templates", {
       main: "<div>{{content}}</div>",
       archivePost: "<div>{{title}}</div><p>{{date}}</p>"
     });
-    store.set(
+    cache.set(
       "posts",
       await DirScanner.scanAndGetFiles("./test/data/project/posts")
     );
@@ -246,7 +246,7 @@ describe("Builder - HTML", () => {
         "<div> <div><div>Fourth post</div><p>04-01-2019</p><div>Third post</div><p>03-01-2019</p><div>Second post</div><p>02-01-2019</p><div>First post</div><p>01-01-2019</p></div></div>"
     };
 
-    const output = await htmlBuilder(store, fakeFile);
+    const output = await htmlBuilder(cache, fakeFile);
     expect(output).toMatchObject(result);
   });
 });
diff --git a/test/unit/builder.markdown.test.ts b/test/unit/builder.markdown.test.ts
new file mode 100644
index 0000000..57f63d3
--- /dev/null
+++ b/test/unit/builder.markdown.test.ts
@@ -0,0 +1,58 @@
+import marked from "marked";
+import { htmlBuilder } from "../../src/domain/builder/builders/html.builder";
+
+import { MemoryCache } from "../../src/lib/cache";
+import { IFile } from "../../src/interfaces";
+import { markdownBuilder } from "../../src/domain/builder/builders/markdown.builder";
+
+jest.mock("../../src/domain/builder/builders/html.builder.ts");
+jest.mock("marked", () => ({
+  parse: jest.fn((markdown: string, callback: any) =>
+    callback(null, "html-output")
+  )
+}));
+
+const mockedMarked = marked as jest.Mocked<typeof marked>;
+
+describe("Builder - Markdown", () => {
+  test("parseMarkdown and htmlBuilder are called", async () => {
+    const cache = new MemoryCache();
+    const fakeFile: IFile = {
+      name: "article.html",
+      extension: "html",
+      modifiedAt: new Date(),
+      path: "",
+      raw: "<!--\n @template main\n-->\n # Hey\nHi"
+    };
+
+    await markdownBuilder(cache, fakeFile);
+    expect(marked.parse).toHaveBeenCalledWith(
+      fakeFile.raw,
+      expect.any(Function)
+    );
+    expect(htmlBuilder).toHaveBeenCalledWith(cache, {
+      ...fakeFile,
+      raw: "html-output"
+    });
+  });
+
+  test("parseMarkdown throws error", async () => {
+    mockedMarked.parse.mockImplementation(
+      jest.fn((markdown: string, callback: any) =>
+        callback(new Error("Markdown error"), null)
+      )
+    );
+    const cache = new MemoryCache();
+    const fakeFile: IFile = {
+      name: "article.html",
+      extension: "html",
+      modifiedAt: new Date(),
+      path: "",
+      raw: "<!--\n @template main\n-->\n # Hey\nHi"
+    };
+
+    return expect(markdownBuilder(cache, fakeFile)).rejects.toThrow(
+      new Error("Markdown error")
+    );
+  });
+});
diff --git a/test/unit/builder.test.ts b/test/unit/builder.test.ts
index b17f9f7..1495671 100644
--- a/test/unit/builder.test.ts
+++ b/test/unit/builder.test.ts
@@ -1,10 +1,10 @@
 import { Builder, IBuilders } from "../../src/domain/builder";
-import { Store } from "../../src/lib/store";
+import { MemoryCache } from "../../src/lib/cache";
 import { IFile } from "../../src/interfaces";
 
 describe("Builder", () => {
   test("Build file calls registered builder", async () => {
-    const store = new Store();
+    const cache = new MemoryCache();
     const fakeFile: IFile = {
       name: "test.html",
       extension: "html",
@@ -12,22 +12,22 @@ describe("Builder", () => {
       path: "",
       raw: "fake-file"
     };
-    const fakeBuilder = jest.fn(async (store, file) => {
+    const fakeBuilder = jest.fn(async (cache, file) => {
       return file;
     });
     const builders: IBuilders = {
       html: fakeBuilder
     };
 
-    const builder = new Builder(store, builders);
+    const builder = new Builder(cache, builders);
     const output = await builder.buildFile(fakeFile);
 
     expect(output).toMatchObject(fakeFile);
-    expect(fakeBuilder).toHaveBeenCalledWith(store, fakeFile);
+    expect(fakeBuilder).toHaveBeenCalledWith(cache, fakeFile);
   });
 
   test("Build file calls unregistered builder", async () => {
-    const store = new Store();
+    const cache = new MemoryCache();
     const fakeFile: IFile = {
       name: "test.css",
       extension: "css",
@@ -35,14 +35,14 @@ describe("Builder", () => {
       path: "",
       raw: "fake-file"
     };
-    const fakeBuilder = jest.fn(async (store, file) => {
+    const fakeBuilder = jest.fn(async (cache, file) => {
       return file;
     });
     const builders: IBuilders = {
       html: fakeBuilder
     };
 
-    const builder = new Builder(store, builders);
+    const builder = new Builder(cache, builders);
     const output = await builder.buildFile(fakeFile);
 
     expect(output).toMatchObject(fakeFile);
diff --git a/test/unit/loader.test.ts b/test/unit/loader.test.ts
index 7f66a6f..eb5f5f2 100644
--- a/test/unit/loader.test.ts
+++ b/test/unit/loader.test.ts
@@ -1,14 +1,14 @@
-import { Loader } from "../../src/domain/filler";
-import { Store } from "../../src/lib/store";
-import { IStore, IConfig, IFile } from "../../src/interfaces";
+import { Loader } from "../../src/domain/loader";
+import { MemoryCache } from "../../src/lib/cache";
+import { ICache, IConfig, IFile } from "../../src/interfaces";
 import { defaultConfig } from "../../src/use-cases/build/config.default";
 
 describe("Loader", () => {
-  let store: IStore;
+  let cache: ICache;
 
   beforeEach(() => {
-    store = new Store();
-    store.set("config", {
+    cache = new MemoryCache();
+    cache.set("config", {
       ...defaultConfig,
       projectFolder: "./test/data/project",
       distFolder: "./test/dist"
@@ -16,49 +16,49 @@ describe("Loader", () => {
   });
 
   test("Folder doesn't exist", async () => {
-    store.set("config", {
-      ...store.get("config"),
+    cache.set("config", {
+      ...cache.get("config"),
       projectFolder: "./test/data/empty-project"
     } as IConfig);
 
-    const loader = new Loader(store);
+    const loader = new Loader(cache);
     await loader.init();
 
-    expect(store.get("templates")).toEqual({});
-    expect(store.get("snippets")).toEqual({});
-    expect(store.get("posts")).toEqual([]);
+    expect(cache.get("templates")).toEqual({});
+    expect(cache.get("snippets")).toEqual({});
+    expect(cache.get("posts")).toEqual([]);
   });
 
   test("Folder is empty", async () => {
-    store.set("config", {
-      ...store.get("config"),
+    cache.set("config", {
+      ...cache.get("config"),
       projectFolder: "./test/data/empty-project"
     } as IConfig);
 
-    const loader = new Loader(store);
+    const loader = new Loader(cache);
     await loader.init();
 
-    expect(store.get("templates")).toEqual({});
-    expect(store.get("snippets")).toEqual({});
-    expect(store.get("posts")).toEqual([]);
+    expect(cache.get("templates")).toEqual({});
+    expect(cache.get("snippets")).toEqual({});
+    expect(cache.get("posts")).toEqual([]);
   });
 
   test("Folder is correct", async () => {
-    store.set("config", {
-      ...store.get("config"),
+    cache.set("config", {
+      ...cache.get("config"),
       projectFolder: "./test/data/project"
     } as IConfig);
 
-    const loader = new Loader(store);
+    const loader = new Loader(cache);
     await loader.init();
 
-    expect(Object.keys(store.get("templates"))).toMatchObject(["main"]);
-    expect(Object.keys(store.get("snippets"))).toEqual([
+    expect(Object.keys(cache.get("templates"))).toMatchObject(["main"]);
+    expect(Object.keys(cache.get("snippets"))).toEqual([
       "analytics",
       "scripts"
     ]);
     expect(
-      store
+      cache
         .get("posts")
         .every(
           (p: IFile) =>
diff --git a/test/unit/memory.cache.test.ts b/test/unit/memory.cache.test.ts
new file mode 100644
index 0000000..82b6716
--- /dev/null
+++ b/test/unit/memory.cache.test.ts
@@ -0,0 +1,9 @@
+import { MemoryCache } from "../../src/lib/cache";
+
+describe("MemoryCache", () => {
+  test("Set/Get keys", () => {
+    const cache = new MemoryCache();
+    cache.set("test", "hello");
+    expect(cache.get("test")).toBe("hello");
+  });
+});
diff --git a/test/unit/store.test.ts b/test/unit/store.test.ts
deleted file mode 100644
index eaa0ab8..0000000
--- a/test/unit/store.test.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Store } from "../../src/lib/store";
-
-describe("Store", () => {
-  test("Set/Get keys", () => {
-    const store = new Store();
-    store.set("test", "hello");
-    expect(store.get("test")).toBe("hello");
-  });
-});