Fixes and MarkDown!

- Fix #22
- Fix #16