Timer fix
pre merge
Merge branch 'master' of https://github.com/Raful/Hoverboard into iteration3