Merge branch 'master' into develop
modified README.md
Merge branch 'develop' into pre-release-0.2