added a toString method
Merge branch 'develop' into scala_2.11

* develop:
  added a toString method