EN-37
Merge pull request #9 from maanenh/fix/EN-37

EN-37