Merge pull request #27 from brianjmiller/master

Build for @garemoko's change
Merge pull request #28 from brianjmiller/master

General cleanup