Added logger and some toString() methods
Merge remote-tracking branch 'origin/master'