Merge Soundrop's changes

oleavr from Soundrop made some improvements like support for tags. It would be nice to have it in one repo :)