Initial Commit
fix bug
Merge branch 'master' of https://github.com/haohao667788/beacon