Added composite comparator
Merge branch 'unstable' of https://github.com/b0noI/AIF2 into unstable