Things to merge in from other server

1. -hostname option
