Merge pull request #93 from ajstanley/7.x

Added fallback for missing genre tags
fixed ds_comp