This fixes #3, resolves #4