fixing #318, modifying regex to check for each condition individually
Merge pull request #321 from toumorokoshi/fix-318

fixing #318, modifying regex to check for each condition individually