Improved scramble
Merge branch 'betterScramble' into development
Improved scramble algorithm