Allow tags and multiple line marks
Refactor parser, support one-line stuff. Add tests.