Added user
Merge branch 'master' into 0.3
Added user test