Updated AAM
Merge branch 'master' of https://github.com/Dingf/Icewrack