Merge tag '0.6.0' into develop

Released-0.6.0 0.6.0
fixed error when no email set to user
Merge branch 'release/0.6.1'