Performance tuning.
Strangest bug ever.
Merge pull request #2 from colefichter/performance_tuning

Performance tuning