merge conflict with chen
Merge branch 'master' of https://github.com/Wenyao/LocUs