toggle #269 #231 fixed
Merge branch 'release' of github.com:fairnopoly/fairnopoly into release