Make the machine name unique
Merge branch 'nomongo'