Updated to support multiple users in the same session (Fixes #68)