Fix bug : Crash when there are little data
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into data#40_wangfeng
Merge pull request #110 from v11985/data#40_wangfeng

Data#40 wangfeng -> yuanzhe