Add users support
Merge pull request #19 from widop/f-users

Add users support