Performance improvement
Merge pull request #156 from zoic21/master

Performance improvement