Merge branch

Fixes to key size and host matching issues when used on non-standard port