Minor perf improvements
Merge pull request #25 from wpreul/master

Minor perf improvements