Merge pull request #3 from jdlnolen/master

Merge cleanup
Merge pull request #4 from jdlnolen/jd-branch

Merge pull request #3 from jdlnolen/master