multi connection bug fixed again
Merge origin/master