Merge pull request #22 from yaronyg/master

Little clean up so relay port specification is centralized