Resolves #43