Merge pull request #6 from eangulus/dev

Initial Staging
Merge pull request #7 from eangulus/staging

Merge pull request #6 from eangulus/dev