Merge pull request #1 from Jcfreak24/master

Test
Merge remote-tracking branch 'upstream/master'