Simple email support added