fix
Merge pull request #4 from coldnight/refactor

fix