Merge pull request #58 from januarsiregar/jams

change criteria and match