Improve modularity
Merge pull request #7 from davidrs/gh-pages

Improve modularity