benchmarking code
Merge branches 'benchmark' and 'master'