Broken links

Also add reference to new website. This change must be done also on gh-pages branch
Merge pull request #520 from victe/master

Broken links in readme.md and by extension in gh-pages