Merge pull request #1 from Vengage/master

Second test