Merge pull request #1 from bickel/master

Master
Merge remote-tracking branch 'origin/gh-pages'