Johansn

You have a point. Changed to a version that uses regexes.