changed hostname on mac
merged with origin/master