数据格式bug
Merge branch 'ericlinj'