add task stopping, see #2