criteria from
Merge branch 'master' of github.com:pguatura/raidenjpa