A few more changes for "pretty" links
Merge pull request #11 from mpetroff/master

More "pretty" links