Perf improvement
Merge pull request #182 from zoic21/master

Perf improvement