Messed up on setTimeout vs setInterval
Merge pull request #440 from isuftin/master

Messed up where timer goes AND called it setInterval accidentally