EN-24
EN-29
EN-30
Merge pull request #7 from maanenh/EN-24-29-30

quick fix for EN-24, EN-29 and EN-30