merge with repo contains several bugfixes