Fixed #142 (for real this time (i think))
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM