Merge pull request #1 from nathancomstock/master

0.0.7