merge cleanup
Merge pull request #113 from codefordc/master

merge cleanup