Use getVariable/setVariable where appropriate to allow name and query attributes to be scoped.
Merge pull request #46 from am2605/4ee8494cafaef111c785bec4f3b311ffb5d64cac

Allow scoped variable names