Merge branch 'develop'
Bump version to 0.9.0
Merge branch 'master' into develop