Merge pull request #3 from elvito/testing

merging
Merge pull request #4 from elvito/master

Merge pull request #3 from elvito/testing