refactoring.
Merge pull request #21 from hkliya/patch-1

refactoring.