addressed pull 121 comments for BUGR-11213
Merge pull request #122 from MonicaMuranyi/dan-S-180031

addressed pull 121 comments for BUGR-11213