Fixed bug with timeouts
Merge branch 'master' of https://github.com/TomBZombie/NoF5
Fixed bug with setTimeout reset