Merge branch 'allow-node-as-scope' (PR #110)