UUID Forced Fixes
Merge pull request #223 from net32/master

UUID Forced Fixes