Adding changes from Thomas Blanchard
- Added options --hosts
- Fixed codingstyle