merge request from xia @version 1

hope it could run successfully