Worked on issue #56.
Resolved merge conflicts