fix scoping issues
Merge pull request #11 from aliaspooryorik/master

fix scoping issues