Merge fixes #6