Remove duplicated macros header
benchmark_min_time now works as expected
benchmark_iterations works as expected
benchmark_repetitions now work
Merging in work from branch