Christian Kuri

The reason I have not merged this pull request is because it doesn't have a test that shows it does work using uuids, please add some tests, and ill merge...

We need tests to verify that this works or I will not merge it.