Added option to always use IP addresses
Added elastiq automatically to the master