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