Added __toString function
Merge branch 'master' into develop