added cancel function
:Merge branch 'master' of https://github.com/ffhs/privatecloud