Initial version
Merge branch 'master' of github.com:timlinux/user_map
Initial implementation work