GRECLIPSE-1129 Fix and tests
GRECLIPSE-1129 Additional test and fix
Merge pull request #75 from DenisMurashev/GRECLIPSE-1129

GRECLIPSE-1129 Fix and tests