setup rounds should not crash now. yay.
Merge remote-tracking branch 'origin/master'