fixed parsing of links, added parsing of some special tags
Merge commit 'e01183530c7d8d05fec5e99c37a2d3cb1a690b3b'