Resolved merge issues
Merge branch 'master' of https://github.com/rchunduru/node-process-trace