added scope pop checking
Merge branch 'master' of https://github.com/redxdev/shogun