switched transform and transformBack method in parser
moved unset of break and return to right position
Merge remote-tracking branch 'origin/dev' into dev