added user-name tracking (fixes #71)