Added: Option for link/element text instead of email address
Minor improvements in the code