Merge pull request #3 from jdlnolen/master

Merge cleanup