Update

- matchin evaluation is now done by a separate class that can be
inherited
- added VS2010 project