Merge pull request #169 from dpefour/master

Some more updates to the documentation. Still WIP
Merge pull request #170 from dpefour/master

Fixes in markup
Update README.md
Update README.md