Merge pull request #2 from mgardellini/master

Merge pull request #1 from mgardellini/staging
Merge pull request #3 from mgardellini/staging

Merge pull request #2 from mgardellini/master