add content and fix
Merge branch 'dev'