Added support for simple links