Refactor and make it working
Merge branch 'master' of github.com:Genshin/gaku_imex