Merge pull request #1 from diafygi/master

merge gh-pages
Merge branch 'master' into gh-pages