Fixes
Parent emails too
Merge branch 'refs/heads/develop'