Fix __toString method
Merge branch '2.1'