refactoried the code
Merge pull request #32 from bcho/develop

refactoried the code