Added uuid-without-dashes (thanks Peter Borg) + some version upgrades