Now properly stops tasks
resolves #5