Implement cancellation and improve cleanup
Merge branch 'master' of github.com:brunodecarvalho/BBHotpotato