Fixes and adjustments

Closes #1 and #4.
Release 0.1.2