Merge pull request #129 from Gautham/Dev

Refactor Code.