Fixed #596
Merge branch 'master' of http://github.com/KoffeinFlummi/AGM