Merge pull request #4 from eangulus/staging

Staging
Merge pull request #5 from eangulus/dev

Merge pull request #4 from eangulus/staging