Merge branch 'master' into develop
removed README.md since .txt is enough
Merge branch 'develop'