Merge branch 'master' into develop
Small fixes
Updated read me.
Merge branch 'develop'