Fixes #13
Fixes #15
Fixes #16
Merge branch 'hotfix/v0.3.1'
Readme update