Merge pull request #40 from breber/gh-pages

Update the website