Fixes #15
Resolved merge conflict