refacto
perf
Merge pull request #21 from cotal/master

refacto