Merge fixes #10