update regexp to capture scheme names with embedded blanks. close #35