added sublinks
fixed merge conflict
Merge pull request #46 from tganyan/links

added sublinks