Merge pull request #23 from horacio3/staging

Staging