use domain name instead of machine name to avoid some name-lookup error
Merge branch 'master' of github.com:MeroCloud/configuration