Merge pull request #6 from J-Christophe/dev

Refactoring and packaging the module