Merge pull request #4 from vsolovyov/master

Fix popScope() with top scope
have a version inside of a source