Add removeClientHandler and add synchronized collections
Implement onDisconnect handler
Merge branch 'on-disconnect-handler'