Merge pull request #56 from vexxhost/scale-retention-and-email

Scale retention and email