Merge pull request #880 from narfbg/develop-benchmark

Improve the Benchmark library