Allow custom remote port
Merge branch 'master' into ports
Only set port when specified
Merge pull request #10 from gondoi/ports

Allow custom remote port