updated to head revision from cesenta