Fix Issues #139 - port should not be hardcoded