Updated README.markdown
Merge pull request #18 from FabianM/develop

Merge develop into master