add feature: add cancel
Merge branch 'development'