string type testing via isinstance(s, basestring)
Merge branch 'master' into matching
+match method