Make settings server close cleanly
Merge pull request #26 from egelmex/master

Make settings server close cleanly