GRECLIPSE-1686 Fix & Test
GRECLIPSE-1686 Minor fix
Merge pull request #48 from DenisMurashev/GRECLIPSE-1686

Greclipse 1686