Merge pull request #175 from andreaswolf/allow-diff-6.0

Merge pull request #175 from andreaswolf/allow-diff-6.0 #97