Merge branch 'hotfix/0.2.1.1'
Merge branch 'release/1.0b1.1'
minor readme changes
Merge branch 'hotfix/1.0b1.1.1' into develop