stringupdate
Merge branch 'DoubleComp'