GaMaDian Architecture
Merge branch 'master' of https://github.com/supermfb/GaMaDian
Modify conflict