Timer ready

merge to MASTER