Fix in the string formatting
Merge branch 'master' into issue_253-2