new uid-ing
Merge pull request #53 from kurunt/dev

new uid-ing