Don't use deprecated APIs
Merge pull request #10 from christav/fix-uuid-usage-7

Don't use deprecated APIs
Merge pull request #36 from christav/master

Don't use deprecated APIs