Added better uid system
Updated Docs
Merge branch 'develop'