Change split char from : to @
Merge from zhaoyang's branch and fix many functions.