Merge pull request #11 from jmaas/master

Fix links
Fix more links.