Merge pull request #168 from bjornerik/gh-pages