Cosmetic change
Add disconnect option for graceful shutdown, 0.0.7