Added the improvements as suggested by @ashutoshdhundhara .
Merge pull request #21 from vidhant/no_uid_generate

Added the improvements as suggested by @ashutoshdhundhara .