adding changes
Merge branch 'master' of https://github.com/b0noI/AIF2
fixing tests
fixing #36