Comming the final changes merged with https://github.com/roojuta/LinkHack