refactor
refactor toString
Merge remote-tracking branch 'upstream/master'