Added support for links and fixed support for images