Resolved merge errors
Merge pull request #592 from abhinavc/master

Resolved merge errors