Start working on benchmark
Merge branch 'bench'
Merge changes from Anders