WIP
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM
work on #677
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM