Fixed server not closing.
Merge