Merged timer branch with master