Update of Itstrings JB branch