GUVNOR-1989
Merge pull request #23 from nheron/GUVNOR-1986_master

GUVNOR-1989