Merge branch 'hotfix/0.9.1'
Updated various files
Merge branch 'hotfix/0.9.2' into develop