Optimization
Merge pull request #1 from logeen/master

Optimization