Merge branch 'release-0.1'
Hotfix for user show.
Merge branch 'master' into release-0.1