0.1.7: Fixed some regex patterns