Added refactored and fixed tri-term generator, for strategy S3
Merge branch 'master' of https://github.com/leifos/ifind