Fixed #52: Added shuffling controls

1 job for feature/52-shuffle-loop in 1 minute and 30 seconds