Merge pull request #1 from luisjuansp/gh-pages

update master
Merge pull request #2 from luisjuansp/master

Merge pull request #1 from luisjuansp/gh-pages