Added support for seealso #8