changed diff library (filename stays the same)
Merge remote-tracking branch 'origin/master'