Merge with https://github.com/johnward2/Four_Square/commit/dce484b4037f0d74ae0ece59768107d827a4a557