Remove stack trace
Lection neun
Merge remote-tracking branch 'upstream/master'