Do some fixup to be more compatible, clean up links.
Merge pull request #5 from luser/master

Do some fixup to be more compatible, clean up links.