This fixes #62 and resolves #63