for jiaxiang
Merge branch 'master' of github.com:tommycxd/Homescent