Merge branch 'Aspect' of https://github.com/Marekkk/deel into aspect
developing aspect
merge