bug fixes
people near by improvement
Merge pull request #33 from Yaliang/master

Master