Fixes #6
Resolved merge conflicts.