Merge branch '1.1'

...oper string representation