First unfinished implementation.
Merge branch 'master' of https://github.com/b0noI/AIF2
Merge branch 'master' of https://github.com/b0noI/AIF2
Fix of tests