Merge pull request #26 from ChrisWesterfield/CON-287

CON-287
CON-287