Merge pull request #2 from tarballsofsteel/indev

0.0.2 indev