Ensure worker close gracefully with the same behaviours in both Terminal and Desktop apps

Ensure worker close gracefully with the same behaviours in both Terminal and Desktop apps #102