Added trap notification
Disabled cleanup on shutdown on Travis