Update timer.c

merging offline developement