Merge pull request #5 from elvito/testing

Merge pull request #4 from elvito/master
Merge remote-tracking branch 'origin/testing'
Merge pull request #6 from elvito/master

pull