Merge pull request #1 from nackjicholson/master

Working version
Download links.
Merge remote-tracking branch 'upstream/master'