Separate diferrent types of matches
Correctly run tests with travis
Merge pull request #25 from golyshevd/i16

Separate diferrent types of matches