improved perf, have to refactor
Merge branch 'master' of https://github.com/SimonBoeuf/filler