stewartmcgown Merge pull request #99 from infinitygamer404/patch-1