GRECLIPSE-1748 Fix and tests
Merge branch 'master' into GRECLIPSE-1748
Merge pull request #65 from DenisMurashev/GRECLIPSE-1748

GRECLIPSE-1748 Fix and tests