The original pull request

And the files from the original pull request.
Merge pull request #3 from Amorano/master

The original pull request