Play around with timer functions
Merge pull request #47 from dreamteam69/master

Play around with timer functions
Merge remote-tracking branch 'upstream/master'