Merge branch 'master' of https://github.com/hicqu/configure
Merge branch 'master' of https://github.com/hicqu/configure