Properly set default port
Merge pull request #1315 from janmeier/defaultPort

Properly set default port - Closes  #1045