Merge branch 'working'
fix udptransport close