Small changes

??
Merge remote-tracking branch 'origin/master'

Conflicts:
	KiF.pde