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