fix state issue
skip two test for now
graceful shutdown
Merge pull request #20 from psichi/develop

Develop