CON-273
bug fix
CON-273
CON-365
bug fix
CON-366
Bug Fix
CON-366
Cleanup
CON-366
minor bug fix
Merge pull request #25 from ChrisWesterfield/master

Bug Fixes