Fixed New users issue
Merge branch 'V0.3.1' into dev