Fix problem with ScopeManager being null.
Merge pull request #127 from digitalcreations/master

Fix problem with ScopeManager being null.
Merge branch 'master' into Next