Added a benchmark suite
Merge conflicts