Merge pull request #237 from hunner/change_port