Fixed handling of links
Merge pull request #18 from veonik/link-fix

Fixed handling of links