Code refactoring
Fix dependencies
Merge pull request #3 from mcanevet/refactoring

Code refactoring
Merge pull request #2 from fpletz/master

Resync with origin