fixed retVal, comments
Merge branch 'br3_' of ssh://git@github.com/dstoyanov/cn.git into br3_