Low hanging fruit
Merge pull request #4 from kylemacfarlane/performance

Some performance tweaks