GRECLIPSE-1693 Fix and unit test
Merge pull request #32 from DenisMurashev/GRECLIPSE-1693

GRECLIPSE-1693 Fix and unit test