Resolves #371