Merging from development.
Merge pull request #7 from kstephens6054/development

Merging from development.
Merge pull request #8 from kstephens6054/staging

Staging