Made email address optional
Merge remote-tracking branch 'upstream/beta-version-2' into fix-duplicate-files