Fixes #1. Also, fixes minor docs issues.
Merge branch 'hotfix/0.1.4'