Up to date with master
Added a test file to test out the timers.
Merge branch 'test'