Merge pull request #104 from sjorek/fix-doctags-vs-email-adresses

Fix: faulty detection of email-adresses as doctags
Merge remote-tracking branch 'nevir/master'