Work on #188, #237
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM