Bug #6 - fixed link validation.
Merge branch 'bug_6' into master-dev