Merge pull request #1 from gh-pages