issue #4
Merge pull request #32 from daimos/master

refactoring