Add safer regex that takes into account more possible whitespace

Add safer regex that takes into account more possible whitespace #53