add cancel buttons, fixes #55
Merge branch 'issue55'