resolved merge conflict
Merge pull request #32 from monishamanoharan/master

edit
edits
fix
resolved merge conflict