Merge pull request #6 from eangulus/dev

Initial Staging