Updated README and supporting code
Resolved merge conflicts