Merge pull request #1 from moduloteam/master

Rebase
Merge pull request #2 from moduloteam/gh-pages

Merge pull request #2  from moduloteam/master