Re-ordering of hostnames for correct resolution. Closes #5