rekursor: Merged modifications from my branch to trunk as requested by Zef. This includes asere patch with few modifications /bug fixes. Included JrCs coding standard name convention change. See CHANGES file for details.