Refactor
Allow indefinite SIGTERM wait
0.4.4