basic structure, untested
Merge branch 'hotfix/0.1.0'