Merge Feature/start_time in master