more tiny performance improvements
Merge pull request #56 from jochenberger/optimizations

more tiny performance improvements