Updated based on Expert tests
Merge branch 'master' of https://github.com/mfioravanti2/maadi-ads