Corrected String code
Merged branches