Potential solution for #85
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM