Merge pull request #3 from moduloteam/master