Merge pull request #1 from Granico/mistress

Mistress