changes with link handling
Merge pull request #9 from wick-ed/master

changes with link handling