Fixing toString, maybe not done
Merge remote-tracking branch 'origin/master'