Issue #123 - Removes hardcoded email address