Updated docs and examples
Resolved merge conflict