switched from the timer controller to a setInterval, oh well. timing …
…seems more reliable, but i think there is a better way with using calculated elapsed time
Merge branch 'noTimeout'