Translate UUID into string correctly
Merge branch 'issue158' into dev