Merge pull request #1 from andonigarcia/gh-pages

Pulling master up-to-date w/gh-pages