Add UUID support
Merge pull request #2 from collinpeters/master

Add UUID support