Merge pull request #1 from luisjuansp/master

update master
Merge pull request #2 from luisjuansp/gh-pages

Merge pull request #1 from luisjuansp/master