Factor 40 and 41 constants from source.
Merge pull request #2567 from cirosantilli/factor-41

Factor 40 and 41 constants from source.