Merge pull request #1 from memelea/master

Test