Adding missing piece for GUID.
Merge pull request #345 from deepy/master

Adding missing piece for GUID.