Major changes

- Bugfix
- Markdown output
- Template included