search criteria generics fix
Merge branch 'master' of https://github.com/jwurm/filesystem-example