GRECLIPSE-1638 Fix and tests
Merge pull request #74 from DenisMurashev/GRECLIPSE-1638

GRECLIPSE-1638 Fix and tests