Added suggested changes by the author
resolved merge conflict
Merge branch 'manimanasamylavarapu-master'