Add links support
Merge pull request #3 from chamerling/master

Add support to links