threads and stuff
Merge remote-tracking branch 'origin/ckozak/timer'