move logic to static methods
add UUID support
version bump
Merge branch 'release/v1.1' into develop