Resolves #40