Cleanup and working
Fix users was always created
Merge pull request #2 from guilhem/master

Cleanup and working