#214 Better signal handling,

See #214