Only show host info when asked for
Merge pull request #12 from kevinqiu/master

Only show host info when asked for