Merge pull request #1 from luisjuansp/gh-pages

update master