Merge pull request #6 from SwapnilDarode/master

Code conflicts resolved
Code Cleaning