1.fix top bug
Merge branch 'master' of https://github.com/zivgo/ToGo