This fixes #21, resolves #22