Updated various files
Merge branch 'hotfix/0.9.2'