Issue #230 with merge conflict fix.