BUGFIX: Fixes #6
Version bump: v0.5.8