Fixed issue #39
Fixed merge conflict