merge request from xia @version 1

hope the project could run successfully