Fixed m3u #34
Merge branch 'develop'