improve shutdown a bit
Merge branch 'master' of ssh://github.com/psichi/chix-flow into develop
Merge pull request #26 from psichi/develop

Develop