Set turn to self
Merge branch 'master' of ../stage