Performance optimizations
Merge pull request #2 from reorder/master

Performance optimizations