Update timer.h
Merge branch 'tem'