Support 'using HOSTNAME' syntax (#52)

This is #52 rebased on top of the latest master.