busy wait corrected 2
Merge branch 'client'