Added a benchmark suite
Merge conflicts
Merge branch 'master' into addvispov
 To include the new changes (added benchmarking)