Ugly motherfucker
Merge branch 'hotfix/v1.0.4'