Merge pull request #1 from andonigarcia/gh-pages

Pulling master up-to-date w/gh-pages
Merge pull request #2 from andonigarcia/master

Merge pull request #1 from andonigarcia/gh-pages