ZEPPELIN-81 handle port number changes
Merge pull request #35 from NFLabs/fix/changing_port_number

ZEPPELIN-81 handle port number changes