spec has been renamed from matchesSelector to just matches
merge fixes for #8