Merge pull request #1 from moduloteam/master

Rebase