FIxes #160

Append port to host header if specified
Add tests
Merge pull request #164 from connyay/issue160

Fixes #160

Thanks Connor!