CON-529
Merge pull request #30 from ChrisWesterfield/CON-529

CON-529