string enhancement

added string to the grammar
Merge branch 'string-enhancement'