Fixed regexp, resolves #4