Refactoring for performance optimizations
Performance optimizations
Merge pull request #2 from wagnert/master

Performance optimizations