bugs by merges fixed Fixes #77
merge