closes #9
Merge pull request #11 from afred/clean-up-links

closes #9