Fixed the merge issues
Merge pull request #41 from BogamSushil/Sushil

Sushil