uids made optional
Merge pull request #2 from xcazin/xc

uids made optional