Merge branch 'master' into develop
removed a few things in readme
Merge branch 'develop'