made integers integers and strings strings
Merge branch 'hhh'