Fixed #91, Fixed #10
Merge branch 'master' of https://github.com/KoffeinFlummi/AGM