Fixed timeout timer behavior
Merge branch 'newJs' of https://github.com/pasinipolimi/Sketchness into newJs