2.1.6 - Fix regex case sensitivity and improvements