Feature/time measurement