Merge pull request #38 from CalvertYang/master

Project edit not finish
fixed issue but not yet
Merge pull request #53 from AndyYou/master

fixed issue but not yet