Merge pull request #1 from gioperalto/staging

Staging
Merge pull request #2 from gioperalto/master

Merge pull request #1 from gioperalto/staging