Now able to match '-' and '.' in namespaces and node names. Fixes #9