Merge pull request #5 from bryan-m-hughes/master

[TIMOB-13709] Bug fixes