fixed bug in data processing.
Merge branch 'test' into dev