Added user names (fixes #10)