Merge pull request #19 from TrentBartlem/master

Updated
Merge pull request #20 from TrentBartlem/master

another merge
Merge pull request #3 from eveRedditBot/master

rebase