Performance improvement
Merge pull request #157 from zoic21/master

Performance improvement