[SQUASH ME] address comments on PR
Merge pull request #7 from N8Fear/scope

[SQUASH ME] address comments on PR