Fixed AOP

The classes are now corrcty waeved
Merge branch 'master' of github.com:rssntn67/SLT