Fixing users
Merge branch 'master' of github.com:ebp-technologies/toolkit