fixes
Merge branch 'master' of https://github.com/stuyfission/kiwi

Conflicts:
	dknopf/omniopcopydk.c