Merge pull request #41 from mtvn-player/music_group_branch