Fixing hyperlinks
Merging master