More last minute changes
Merge branch 'hotfix/0.1.2'