EN-16
EN-15
Merge pull request #8 from maanenh/fix/EN-15-16-DateIssues

Fix/EN-15 and EN-16 (date issues)