Added a timer class + minor tests
Merge branch 'feat/timer' into dev