Issue #29 partial
users lookup updated