Fix dependencies and update version
Fix version
Final commit
Fix changes
Merge pull request #6 from fredericBregier/master

Fix following Upgrade and others