refactoring code from MusicBundle
Merge branch 'master' of github.com:AIOMedia/MediaBundle