updated for child emails
Merge branch 'master' of ssh://github.com/tbonsell/vcontrol