improve use of regexes
Merge branch 'master' of github.com:NZOI/nztrain