updated ruby regexs