BBGMN-1155 test case
BBGMN-1155 Fix
Merge pull request #7 from flipmcf/master

Test and Fix for BBGMN-1155