added @links support; added cli interface