Add toString() method.
Merge branch 'origin/develop'