Fixed links
Merge pull request #285 from TekHus/master

Fixed Links
Merge pull request #784 from KevWright/master

Fixed Links