Merge pull request #1 from ixdiego/master

merge to gh-pages
Merge pull request #2 from ixdiego/gh-pages

Merge pull request #1 from ixdiego/master