Added better regex flexibility
v1.1.1