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