better solution for 1223
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM