Prepare create_user function
Improve create_user function (closes #1)
Merge branch 'devel'