client separate threads functional
Merge origin/master