Added shape options when creating a new arena
Merge branch 'master' into FernandoC
Merge remote-tracking branch 'origin/FernandoC' into test-afshin