Merged pull req from arminelec
Updated links to the web site