Merge branch 'master' into develop
Updated README

Fixed yet another typo.
Clarified parts of the readme.
Merge branch 'develop'