Merge pull request #3 from jaime5x5/master

update master
Merge pull request #4 from jaime5x5/gh-pages

Merge pull request #3 from jaime5x5/master