Resolved merge conflicts from PR#37