fixed #237, I think. Also some tweaks to the Malleus Maleficarum
Merge remote-tracking branch 'origin/master'