Updated with a shitton of stuff
Merge pull request #3 from Kwongger/patch-2

Updated with a shitton of stuff