CON-208
bug fix
CON-208
cleanup
Merge pull request #21 from ChrisWesterfield/CON-208

CON-208