commits from socket
Merge branch 'master' of github.com:Youw/TaskSocketXML