Merge branch 'develop'
Count 3 times for each round
Add state
Merge branch 'master' into develop