Merge pull request #1 from tgherzog/gh-pages

Update master from gh-pages
Merge branch 'gh-pages'