New Version
Merge pull request #1 from cfhughes/develop

New Version
Merge pull request #2 from cfhughes/staging

Staging