Update README.md
Merge branch 'master' into apache
Enabled port collision auto-correction