Added uppercase support
Added strutil
Use strutil's to_upper_const() func