update people
Merge branch 'master'