Dont wait for 10 seconds. Add 500 round limit.
merge
Merge branch 'Zhan'