more, small updates; included criterium, for testing
Merge branch 'master' of https://github.com/frsfnrrg/gipf