Adding a cancel functionnality (issue #35)