Removes logging
Adds functionality to specify how many time stops before printing a avarage
Merging master