Work on #290, needs testing
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM