Add Host option
Fix line breaks