Merge pull request #57 from hovancik/fix/links