e18
Merge pull request #106 from barosl/e18

e18

Reviewed-by: barosl