Resolves #63