Merge pull request #2 from diegosch21/master

merge
Merge remote-tracking branch 'origin/master' into gh-pages
Merge remote-tracking branch 'origin/gh-pages'