Resolves #39