Merge pull request #35 from doug-martin/master

v0.1.2