Fix bug in Link creation
Remove old comments
Merge branch 'master' of https://github.com/SnoopInf/pzks.git