Added option to do not link itself, bugfixes