started work on round setup
Merge branch 'master' of ../stage