code style, PEP8
refactoring
Merge branch 'master' into udp_connection