added some utility code for UUID conversion
merged in package conflict