Change shebang link overlap
Merged master into vgmm