Merge pull request #834 from Stuk/benchmark

Add benchmark/performance tests