data
Merge branch 'master' of https://github.com/zzhaoai/Stop
More bugs fixed