added support for links and title attributes