refactor
Merge pull request #2 from zwan0518/patch-2

refactor