this closes #1
this closes #2
bump changelog
Merge branch 'hotfix/0.1.1'