Merge branch 'release-2.0' into develop
updated README
Merge branch 'develop'
fixed formatting
Merge branch 'develop'