Merge pull request #2 from tarballsofsteel/indev

0.0.2 indev
Merge pull request #3 from tarballsofsteel/master

Merge pull request #2 from tarballsofsteel/indev