Improved bench.py
Merge branch 'master' into ri
Add -ri executables to benchmark