Performance polish
Merge pull request #3 from ivanzhaowy/master

Performance polish