Merge branch 'bowen' into rtong
Merge branch 'bowen' into rtong
fix bug with real data

fix lalala
fix null pointer
hello bowen
Merge branch 'rtong' into bowen