Corrected parser for end entity Name;
Merge branch 'master' of github.com:uve-project/uve