Main design
Merge branch 'master' of https://github.com/a71993/MAK.git