Fix bugs in scope
Merge branch 'master' of github.com:keydunov/breath