Cleanup
Merge pull request #63 from glennblock/dev

Cleanup