V0.1hotfix

Merge of fixes from v0.1.1.