Fix bug: shuffle mode crashed the player.
Merge branch 'master' of github.com:mfontanini/shaplim