Optimize performance
Merge pull request #1 from philipqnguyen/optimize

Optimize performance