wip
Merge branch 'fix_about'