added fix to save uuid strings as binary
fixed missing $return declaration
refactored to psr-2
Merge branch 'develop'