Update after 0.1.2 release

Please review, because I've updated this based on the commit and haven't tested this yet.
Merge pull request #142 from tcoopman/patch-3

Update after 0.1.2 release