Revert "Revert "Merged suhas and bsharanya s code""
Merge pull request #5 from niloa/revert-4-revert-3-master

Revert "Revert "Merged suhas and bsharanya s code""