Added basic AOP support
Fixed MainAspect
Merge branch 'basic-aop'