Merged hotfix commit into maser
Merge branch 'hotfix/0.0.9a'