fix for #91, added more regex values
fix for #91, added more regex values