change the structure of subtitles
Merge branch 'develop'