added correct user names
merged with master