refactoring
Merge pull request #1 from shekhar-os/master

refactoring