Fixes #26 + bumps version
Merge branch 'hotfix/v0.4.8'