modified
Merge branch 'master' of github.com:aq2bq/magi2