Replace constant with variable to get rid of warn
Merge pull request #649 from dmitryilyin/misc_fixes

Replace constant with variable to get rid of warn