Merged in default (pull request #23)

This should fix everything up about links...

Approved-by: Elliott Sales de Andrade