Merge pull request #287 from Talksum/master

zproxy api adjustments + test improvements
Added UUID support class
Merge pull request #288 from hintjens/master

Added UUID support class