[develop] Fix #27 Add support for port connection