Merge pull request #1 from jmargatan/gh-pages

Pull from gh-pages.