Merge fixes #9