bug fix v1.1
Merge branch 'master' into r2_content
final content