Merge branch 'develop'
Fixed conflict in README.me