Feature/better matching

closes #4 
closes #7