Close #7. Refactor matching/replacing. Update to 2.0.0