Adding support for --host option