Parser uniqueness check. Makefile fix.
Merge branch 'master' of https://github.com/dmitryfd/Zond