Added stronger pass criteria
Merge branch 'master' of github.com:frankpermenter/frlib