added link to the website
Merge branch 'master' into gh-pages