Fix bug in run..wait
Merge branch 'master' of https://github.com/zaqwes8811/shard-cpp-test