aaap recent fixes
Merge branch 'master' of https://github.com/TakenCdosG/aaap_custom_module