Fixed Timer reseting on navigation away
Merge branch 'master' of https://github.com/dellywheel/Amur8