v0.1-2 as submitted to QA
- Fixed Timer updates