Change host on unknown host exception
Merge remote-tracking branch 'antox/master'