merge Dev to master

[bug fixed] core error