timer changes
implement decrement/increment
Merge remote-tracking branch 'origin/master'