I love this app and I use it all the time. I know there is already a shuffle option but I would much rather have the current song end then every song AFTER be shuffled.