Refactor module to major upgrade 4.x
Merge pull request #14 from fsalum/refactor

Refactor module to major upgrade 4.x