Hotfix/v0.3.4