refactor using FACTORIES
Merge branch 'master' of https://github.com/h4w5/tunr
refactor test
Merge branch 'master' of https://github.com/h4w5/tunr