Version 1.8:
- add prefixes support
- code cleanup