Performance improvement
Merge pull request #159 from zoic21/master

Performance improvement