A little bit of refactoring performed.
Transitional commit, fixing in progress.
Issue resolved, all tests succeeded.
Merge pull request #59 from kizhaevv/GRECLIPSE-1702

Greclipse 1702