Merge pull request #2 from XPilo/master

Merge pull request