Cleanup
Merge pull request #23 from jetty840/dnewman-merge

Cleanup