setup improve
Merge pull request #5578 from minggo/install

setup improve