Merge pull request #284 from TekHus/master

Fixed a link
Merge pull request #783 from KevWright/master

Fixed a link
Fixed links