Merge pull request #1 from MadCow234/master

Test