update regexps to work in Windows
6.3.2