Merge branch 'hotfix-0.8.3'
Merge branch 'release-0.9.0'
Fixed typo, Closes #255
Updated history
Merge branch 'hotfix-0.9.1' into develop