Merge pull request #1 from Stephiroth7/testBranch

Test branch