refactor
Merge pull request #15 from shoito/hotfix/refactor

refactor