added criteria-based mapping #50
reflected review comment #50
Merge pull request #128 from terasolunaorg/issues/50

Issues/50