Merge pull request #3 from Granico/mistress

Merge pull request #2 from Granico/master
issue #5