Interface improvements and multi matching, updated tests
0.2.0