merging
Merge pull request #3 from elvito/testing

merging