Merge pull request #10 from wpexia/dev

Dev
调整