refactoring logic
Merge branch 'master' of https://github.com/b0noI/AIF2