add scoping of selectors
Merge branch 'master' of https://github.com/malko/basic-compat