Work on proper user handling
Merge branch 'master' into gh-pages