Added scoping
Merge branch 'master' of https://github.com/MikeyBurkman/eggnog