Change the usage of constants with their values
Merge pull request #15 from ivannov/FORGE-2120

Change the usage of constants with their values