@_@
Merge branch 'dev_1.0'