Implemented FORGE-1254 and Unit Test
Merge pull request #9 from selrahal/FORGE-1254

Implemented FORGE-1254 and Unit Test