Fixes

Formation Limitation on Defender! #4
Reshuffle fix
Merge branch 'master' into gh-pages