Suggestions for more detailed description of Constants.
Merge branch 'pr/41'