Revert "Revert "Merge branch 'master' of https://github.com/2081/4if-prolog""

This reverts commit b7c7e6b0d8b1abadb893488300a1233ec69bf155.