added @links support; added cli interface
Merge pull request #2 from kyriosli/master

added @links support; added cli interface