Merge branch 'master', remote branch 'origin'
add options to benchmarks to select CPU/GPU