Merge pull request #1 from marekmilewski/users

Users