Allow whitespace characters
Fixed regexp
merge