slight improvements in regular expression No.2; matches now also PSM