fixing up bad merge
Merge pull request #34 from phillip-haydon/CleanUp

fixing up bad merge