detect disconect
client stuck fixed
Merge branch 'master' into lopv2