Removed delay between end of song and delay, stop button functions properly
Merge remote-tracking branch 'origin/master'