e2
Merge pull request #90 from barosl/e2

e2

Reviewed-by: barosl