Cleanup + cancel stops the timer
Merge branch 'master' of github.com:ankka/handshake