Update timer.h

merging offline developement