Test commit
Merge pull request #2 from Pheo/master

Test commit