Faster shutdown
Merge pull request #296 from dryabov/patch-4

Faster shutdown