A little bit of refactoring performed.
Modification of formatter for the sake of windows line endings performed.
Transitional commit, fixing in progress.
Issue resolved, all tests succeeded.
Merge pull request #60 from kizhaevv/GRECLIPSE-1724

GRECLIPSE-1724
Merge pull request #59 from kizhaevv/GRECLIPSE-1702

Greclipse 1702
GRECLIPSE-1748 Fix and tests