Merged in efritz/convey/cleanup-on-signal (pull request #34)

2017-10-15, Gary Kramlich