bug fixed, closed connection
bug fixed, closed connection
Revert "bug fixed, closed connection"

This reverts commit 251a1f6eeee1e8146abc6c6b87e2586994c37dd9.
bug fixed, closed connection
Merge origin/master