UID support
Merge pull request #2 from valmet/uid

UID support