United diff function, threshold keys
Merge branch 'master' of https://github.com

Conflicts:
	README.md