Merge branch 'develop'
Hotfix README
Hotfix glaring error #2
Merge branch 'master' into develop