Merge pull request #1 from sir-buckyball/gh-pages

merging a gh-pages change into the master branch.
Merge branch 'master' into gh-pages