Merge pull request #1 from jmargatan/gh-pages

Pull from gh-pages.
Merge pull request #2 from jmargatan/master

Merge pull request #1 from jmargatan/gh-pages