Merge pull request #346 from csnv/master

Fixed songs, working with setting song_timer_reset: 0