The option to drain the queue at exit is now configurable
Merge branch 'working'

The option to drain the queue or not at exit is now configurable