SWC-375 Fixed bugs in the autolink parsers
Merge pull request #479 from heidiso/develop

SWC-375 Fixed bugs in the autolink parsers