Resolves #64