Merge branch 'develop'
Merge branch 'refs/heads/develop'
Merge branch 'develop'
fixed frame name for MP3#subtitle
Merge branch 'master' into develop
restored MP3#user_info
bump to 0.3.1