fix link bug
Merge branch 'master' into cana