Performance enhancements
Merge pull request #1 from reorder/master

Performance enhancements