added constant and modified version.
Merge branch 'develop'