Merge pull request #36 from doug-martin/master

v0.1.3