Merge pull request #35 from FeministSoftwareFoundation/mistress

Mere mistress into master
Merge pull request #36 from FeministSoftwareFoundation/master

Merge pull request #35 from FeministSoftwareFoundation/mistress