Make compatible with Java 1.6
Merge branch 'master'
Update pom
yup
UUID update