Merge fixes #8