Fixed #11 - changed the Uuid Class