Merge pull request #19 from horacio3/staging

Staging