This fixes #57, also resolves #60, resolves #63,