using .host instead of .hostname+.port
Merge branch 'pr/141'