Fixing #79, Allowing non-standard HTTP and HTTPS ports
Fixed 2d34e1ca3b341356463adae08334d9bb31277b24 leftover, Closes #86