Commits fcd9532: Terminate buffer tool gracefully instead of killing (Kiblyn11) #219 03aa596: Merge of PR #219 (Nick Wallace)