- Typos
- Code refactored to use configurable marker strings