Handle links better
Merge pull request #5 from mystor/patch-2

Handle links better