fixed issue #18
Resolved merge conflict