Sonme Refactoring
Merge pull request #103 from lochana/master

Some Refactoring