Clean parser. Minor fixes to names generator
Update TODO: support for template context in certain cases
Update code example in README