Merge pull request #1 from xloxlo/master

gh-pages