fix minor bug in structure matcher
Automatic Py3k merge for testing