Resolves #36