e6
Merge pull request #94 from barosl/e6

e6

Reviewed-by: barosl