Merge pull request #31 from rrch/master

0.1.0