Patched in Florians latest changes from old repo
Added support for nonfree benchmarks