Update
Final
Merge pull request #1 from kwhmp/people

Update master