Fixed #15 - Improved generation of links to pages