Performance improvement
Merge pull request #158 from zoic21/master

Performance improvement