fix for .fromSelector()
Merge branch 'master' into working