Use settings provided port to run HTTP server
Merge remote-tracking branch 'upstream/master' into refactor