hotfix
Merge branch 'hotfix/v0.5.4'