Merge pull request #2 from Granico/master

Merge pull request #1 from Granico/mistress
Merge pull request #3 from Granico/mistress

Merge pull request #2 from Granico/master