bugfixes
merge develop