Merge pull request #434 from wernsaar/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Fri, 15 Aug 2014 00:07:27 +0000 (08:07 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Fri, 15 Aug 2014 00:07:27 +0000 (08:07 +0800)
A lot of performance enhancements


Trivial merge