CON-580
Merge pull request #36 from ChrisWesterfield/CON-580

CON-580