quick and dirty find & replace
moved left-over material to next session
Merge remote-tracking branch 'upstream/master'