Merge pull request #7 from diegobeauroyre/master

Merge pull request #6 from diegobeauroyre/gh-pages
Merge pull request #8 from diegobeauroyre/gh-pages

Merge pull request #7 from diegobeauroyre/master