NAFQA-30 fix issue with recursive calls
Merge branch 'NAFQA-30' of gitorious.nr:tools/judge into NAFQA-30