Merge pull request #17 from vikramrajkumar/master

Refactoring