Resolves #36.