Performance improvements
Merge pull request #46 from RickMohr/improve-performance

Performance improvements