Merge fixes #5