Merge pull request #9 from labriola/develop

Reverted change to Scope to test compiler fix
Merge pull request #10 from labriola/develop

Develop