Make bench configurable
Merge pull request #1 from eGavr/make-bench-configurable

Make bench a little bit more configurable