Merge pull request #11 from tiarebalbi/staging

Staging