Make the project compliant EE6

Hello,

can you study my pull request to use your project in an ee6 context.

Thank's a lot,
Fabien