Fixed problem with format name of constants
Merge remote-tracking branch 'origin/master'