refacto
Merge pull request #2 from c2is/refacto

refacto