Fix bug
Fix bug 2
Merge pull request #148 from v11985/data#40_wangfeng

Data#40 wangfeng
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_yuanzhe